X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fenv;h=84166ae5fe45ddeefb82f060fb8d3d1b898e81c9;hb=69021e9b89ad873e2c5f0a9c10fcb5a7ca003d21;hp=1aee4b323b82b7565ef867aba36cb57152aa4b71;hpb=1063f8d415b283779cc459b6c0fbfb91810c83f2;p=openwrt%2Fopenwrt.git

diff --git a/scripts/env b/scripts/env
index 1aee4b323b..84166ae5fe 100755
--- a/scripts/env
+++ b/scripts/env
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 BASEDIR="$PWD"
 ENVDIR="$PWD/env"
+export GREP_OPTIONS=
 
 usage() {
 	cat <<EOF
@@ -14,7 +15,8 @@ Commands:
 	delete <name>     Delete an environment
 	rename <newname>  Rename the current environment
 	diff              Show differences between current state and environment
-	save              Save your changes to the environment
+	save [message]    Save your changes to the environment, optionally using
+	                  the given commit message
 	revert            Revert your changes since last save
 
 Options:
@@ -96,18 +98,19 @@ env_do_reset() {
 
 env_list() {
 	env_init
-	git branch | grep -vE '^. master$'
+	git branch --color | grep -vE '^. master$'
 }
 
 env_diff() {
 	env_init
 	env_sync_data
-	git diff --cached
+	git diff --cached --color=auto
+	env_link_config
 }
 
 env_save() {
 	env_init
-	env_sync
+	env_sync "$@"
 	env_link_config
 }
 
@@ -118,12 +121,12 @@ env_revert() {
 }
 
 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
-			env_sync_data
 			env_do_reset
 		fi
 	}
@@ -137,7 +140,9 @@ env_clear() {
 	env_sync_data
 	if ask_bool 1 "Do you want to keep your current config and files"; then
 		mkdir -p "$BASEDIR/files"
-		cp -a "$ENVDIR/files/*" "$BASEDIR/files" 2>/dev/null >/dev/null
+		shopt -s dotglob
+		cp -a "$ENVDIR/files/"* "$BASEDIR/files" 2>/dev/null >/dev/null
+		shopt -u dotglob
 		cp "$ENVDIR/.config" "$BASEDIR/"
 	else
 		rm -rf "$BASEDIR/files" "$BASEDIR/.config"
@@ -150,7 +155,6 @@ env_delete() {
 	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"
@@ -159,11 +163,10 @@ env_delete() {
 env_switch() {
 	local name="${1##*/}"
 	[ -z "$name" ] && usage
-	[ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"
 
 	env_init
 	env_ask_sync
-	git checkout "$name"
+	git checkout "$name" || error "environment '$name' not found"
 	env_link_config
 }
 
@@ -191,9 +194,12 @@ env_new() {
 	fi
 	git checkout -b "$1" "$from"
 	if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
-		if ask_bool 1 "Do you want to keep your current config and files?"; then
+		if ask_bool 1 "Do you want to start your configuration repository with the current configuration?"; then
 			[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
-				mv "$BASEDIR/files/"* "$ENVDIR/" 2>/dev/null
+				mkdir -p "$ENVDIR/files"
+				shopt -s dotglob
+				mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
+				shopt -u dotglob
 				rmdir "$BASEDIR/files"
 			}
 			env_sync