X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fenv;h=5542b2017be31c4282ba4677aa10d50a6619d52b;hb=1c4513e58b24f3c48d2caa8ebdd5fc388cc27ef6;hp=ebd2dac38eef66843bf16edba659bf7973433573;hpb=2759bfac85a8a30d9c41cae1f4016c0eaaf416b3;p=openwrt.git

diff --git a/scripts/env b/scripts/env
index ebd2dac38e..5542b2017b 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
@@ -96,13 +97,13 @@ 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
 	env_link_config
 }
 
@@ -192,7 +193,7 @@ 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