[ar71xx] remove some debug stuff

[openwrt.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index a1211fb..e088695 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -148,21 +148,20 @@ env_clear() {
 
 env_delete() {
        local name="${1##*/}"
 
 env_delete() {
        local name="${1##*/}"

+       env_init

        [ -z "$name" ] && usage
        [ -z "$name" ] && usage

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

        branch="$(git branch | grep '^\* ' | awk '{print $2}')"
        branch="$(git branch | grep '^\* ' | awk '{print $2}')"

-       [ "$name" = "branch" ] && error "cannot delete the currently selected environment"
+       [ "$name" = "$branch" ] && error "cannot delete the currently selected environment"

        git branch -D "$name"
 }
 
 env_switch() {
        local name="${1##*/}"
        [ -z "$name" ] && usage
        git branch -D "$name"
 }
 
 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
 }