X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/70df49d54155019d53d864cd7341e97681afbc2e..c0ade48327ba560509bce52b7e22b2225dd50475:/scripts/env?ds=inline

diff --git a/scripts/env b/scripts/env
index ebfbb70c5..24d4bec64 100755
--- a/scripts/env
+++ b/scripts/env
@@ -96,14 +96,14 @@ 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() {
@@ -138,7 +138,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"
+		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,10 +192,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" ] && {
 				mkdir -p "$ENVDIR/files"
+				shopt -s dotglob
 				mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
+				shopt -u dotglob
 				rmdir "$BASEDIR/files"
 			}
 			env_sync