[ar71xx] tew-632brp: increase the size of rootfs partition, and build one unified...

[openwrt.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index 1aee4b3..65594f9 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -103,6 +103,7 @@ env_diff() {
        env_init
        env_sync_data
        git diff --cached
        env_init
        env_sync_data
        git diff --cached

+    env_link_config

 }
 
 env_save() {
 }
 
 env_save() {


@@ -118,12 +119,12 @@ env_revert() {
 }
 
 env_ask_sync() {
 }
 
 env_ask_sync() {

+       env_sync_data

        LINES="$(env_diff | wc -l)" # implies env_init
        [ "$LINES" -gt 0 ] && {
                if ask_bool 1 "Do you want to save your changes"; then
                        env_sync
                else
        LINES="$(env_diff | wc -l)" # implies env_init
        [ "$LINES" -gt 0 ] && {
                if ask_bool 1 "Do you want to save your changes"; then
                        env_sync
                else

-                       env_sync_data

                        env_do_reset
                fi
        }
                        env_do_reset
                fi
        }


@@ -150,7 +151,6 @@ env_delete() {
        local name="${1##*/}"
        env_init
        [ -z "$name" ] && usage
        local name="${1##*/}"
        env_init
        [ -z "$name" ] && usage

-       [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"

        branch="$(git branch | grep '^\* ' | awk '{print $2}')"
        [ "$name" = "$branch" ] && error "cannot delete the currently selected environment"
        git branch -D "$name"
        branch="$(git branch | grep '^\* ' | awk '{print $2}')"
        [ "$name" = "$branch" ] && error "cannot delete the currently selected environment"
        git branch -D "$name"


@@ -159,11 +159,10 @@ env_delete() {
 env_switch() {
        local name="${1##*/}"
        [ -z "$name" ] && usage
 env_switch() {
        local name="${1##*/}"
        [ -z "$name" ] && usage

-       [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"

 
        env_init
        env_ask_sync
 
        env_init
        env_ask_sync

-       git checkout "$name"
+       git checkout "$name" || error "environment '$name' not found"

        env_link_config
 }
 
        env_link_config
 }