BCMA - Reorder SPROM fill

[openwrt.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index 65594f9..24d4bec 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -96,14 +96,14 @@ 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
-    env_link_config
+       git diff --cached --color
+       env_link_config

 }
 
 env_save() {
 }
 
 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"
        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"
                cp "$ENVDIR/.config" "$BASEDIR/"
        else
                rm -rf "$BASEDIR/files" "$BASEDIR/.config"


@@ -190,9 +192,12 @@ 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" ] && {
                        [ -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
                                rmdir "$BASEDIR/files"
                        }
                        env_sync