dnsmasq: rework network interface ignore

[openwrt/staging/jow.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index 1aee4b323b82b7565ef867aba36cb57152aa4b71..5987b4160f4a87a825ee13d8459ee9ae2c31e780 100755 (executable)
--- 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,13 +15,14 @@ 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:
 
 EOF
-       exit ${1:-1}
+       exit "${1:-1}"
 }
 
 error() {
@@ -40,7 +42,7 @@ ask_bool() {
                local VAL
 
                echo -n "$* ($defstr): "
-               read VAL
+               read -r VAL
                case "$VAL" in
                        y*|Y*) val=0;;
                        n*|N*) val=1;;
@@ -55,11 +57,11 @@ env_init() {
        if [ -z "$CREATE" ]; then
                [ -d "$ENVDIR" ] || exit 0
        fi
-       [ -x "$(which git 2>/dev/null)" ] || error "Git is not installed"
+       command -v git >/dev/null || error "Git is not installed"
        mkdir -p "$ENVDIR" || error "Failed to create the environment directory"
        cd "$ENVDIR" || error "Failed to switch to the environment directory"
        [ -d .git ] || { 
-               git init &&
+               git init -b master &&
                touch .config &&
                mkdir files &&
                git add . && 
@@ -71,7 +73,7 @@ env_init() {
 }
 
 env_sync_data() {
-       [ \! -L "$BASEDIR/.config" -a -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR"
+       [ ! -L "$BASEDIR/.config" ] && [ -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR"
        git add .
        git add -u
 }
@@ -96,18 +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
+       git diff --cached --color=auto
+       env_link_config
 }
 
 env_save() {
        env_init
-       env_sync
+       env_sync "$@"
        env_link_config
 }
 
@@ -118,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
        }
@@ -133,16 +136,18 @@ env_clear() {
        env_init
        [ -L "$BASEDIR/.config" ] && rm -f "$BASEDIR/.config"
        [ -L "$BASEDIR/files" ] && rm -f "$BASEDIR/files"
-       [ -f "$ENVDIR/.config" ] || ( cd "$ENVDIR/files" && find | grep -vE '^\.$' > /dev/null )
+       [ -f "$ENVDIR/.config" ] || ( cd "$ENVDIR/files" && find . | grep -vE '^\.$' > /dev/null )
        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"
        fi
-       cd "$BASEDIR"
+       cd "$BASEDIR" || exit 1
        rm -rf "$ENVDIR"
 }
 
@@ -150,7 +155,6 @@ env_delete() {
        local name="${1##*/}"
        env_init
        [ -z "$name" ] && usage
-       [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"
        branch="$(git branch | grep '^\* ' | awk '{print $2}')"
        [ "$name" = "$branch" ] && error "cannot delete the currently selected environment"
        git branch -D "$name"
@@ -159,11 +163,10 @@ env_delete() {
 env_switch() {
        local name="${1##*/}"
        [ -z "$name" ] && usage
-       [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"
 
        env_init
        env_ask_sync
-       git checkout "$name"
+       git checkout "$name" || error "environment '$name' not found"
        env_link_config
 }
 
@@ -182,7 +185,7 @@ env_new() {
        env_init 1
        
        branch="$(git branch | grep '^\* ' | awk '{print $2}')"
-       if [ -n "$branch" -a "$branch" != "master" ]; then
+       if [ -n "$branch" ] && [ "$branch" != "master" ]; then
                env_ask_sync
                if ask_bool 0 "Do you want to clone the current environment?"; then
                        from="$branch"
@@ -190,12 +193,15 @@ env_new() {
                rm -f "$BASEDIR/.config" "$BASEDIR/files"
        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
-                       [ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
-                               mv "$BASEDIR/files/"* "$ENVDIR/" 2>/dev/null
+       if [ -f "$BASEDIR/.config" ] || [ -d "$BASEDIR/files" ]; then
+               if ask_bool 1 "Do you want to start your configuration repository with the current configuration?"; then
+                       if [ -d "$BASEDIR/files" ] && [ ! -L "$BASEDIR/files" ]; then
+                               mkdir -p "$ENVDIR/files"
+                               shopt -s dotglob
+                               mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
+                               shopt -u dotglob
                                rmdir "$BASEDIR/files"
-                       }
+                       fi
                        env_sync
                else
                        rm -rf "$BASEDIR/.config" "$BASEDIR/files"