scripts/env: replace -a and -o with &&/||

The former are not well defined.

Found with shellcheck.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/scripts/env b/scripts/env
index f93a587894fe69b348aebac104e900f4425934a5..7bfca58c5dd9dc815685e5003df2f1ca03cde772 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -73,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
 }
@@ -185,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"
@@ -193,15 +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 [ -f "$BASEDIR/.config" ] || [ -d "$BASEDIR/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" ] && {
+                       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"