X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fenv;h=63e26eb154da83b638b8c2dc766edbc8a6f98f3f;hp=642a329c16f5fee39a01336e675ce957fbc52bb1;hb=f2277a967d949e89f36a57d59fb2b3830a3c5141;hpb=5ac739856584ce2ce29a58b23291e26fc8a6b829

diff --git a/scripts/env b/scripts/env
index 642a329c16..63e26eb154 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,19 +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
-    env_link_config
+	git diff --cached --color
+	env_link_config
 }
 
 env_save() {
 	env_init
-	env_sync
+	env_sync "$@"
 	env_link_config
 }
 
@@ -119,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
 	}
@@ -138,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"
@@ -190,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