From eeddc0fb462be32e9200610778d87a5d0b7a0b94 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 27 Aug 2008 14:13:47 +0000 Subject: fix ./scripts/env delete git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12399 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/env | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/env') diff --git a/scripts/env b/scripts/env index a1211fbde..1aee4b323 100755 --- a/scripts/env +++ b/scripts/env @@ -148,10 +148,11 @@ env_clear() { env_delete() { local name="${1##*/}" + env_init [ -z "$name" ] && usage - [ -f "$envdir/.git/refs/heads/$name" ] || error "environment '$name' not found" + [ -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" + [ "$name" = "$branch" ] && error "cannot delete the currently selected environment" git branch -D "$name" } -- cgit v1.2.3