build: ensure that reordering of KCONFIG lines are handled properly and that the...

[openwrt/svn-archive/archive.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index ebd2dac38eef66843bf16edba659bf7973433573..24d4bec64f06953695ea3bc0dfafb233d33f96d7 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -96,13 +96,13 @@ env_do_reset() {
 
 env_list() {
        env_init
 
 env_list() {
        env_init

-       git branch | grep -vE '^. master$'
+       git branch --color | grep -vE '^. master$'

 }
 
 env_diff() {
        env_init
        env_sync_data
 }
 
 env_diff() {
        env_init
        env_sync_data

-       git diff --cached
+       git diff --cached --color

        env_link_config
 }
 
        env_link_config
 }
 


@@ -192,7 +192,7 @@ env_new() {
        fi
        git checkout -b "$1" "$from"
        if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
        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
                        [ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
                                mkdir -p "$ENVDIR/files"
                                shopt -s dotglob