domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
The former are not well defined.

Found with shellcheck.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-12-31 18:01:43 -08:00
committed by Adrian Schmutzler
parent 2fe5319d58
commit 995378a2a5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/env
View File

@@ -73,7 +73,7 @@ env_init() {
} }
env_sync_data() { 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 .
git add -u git add -u
} }
@@ -185,7 +185,7 @@ env_new() {
env_init 1 env_init 1
branch="$(git branch | grep '^\* ' | awk '{print $2}')" branch="$(git branch | grep '^\* ' | awk '{print $2}')"
if [ -n "$branch" -a "$branch" != "master" ]; then if [ -n "$branch" ] && [ "$branch" != "master" ]; then
env_ask_sync env_ask_sync
if ask_bool 0 "Do you want to clone the current environment?"; then if ask_bool 0 "Do you want to clone the current environment?"; then
from="$branch" from="$branch"
@@ -193,15 +193,15 @@ env_new() {
rm -f "$BASEDIR/.config" "$BASEDIR/files" rm -f "$BASEDIR/.config" "$BASEDIR/files"
fi fi
git checkout -b "$1" "$from" 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 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" mkdir -p "$ENVDIR/files"
shopt -s dotglob shopt -s dotglob
mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
shopt -u dotglob shopt -u dotglob
rmdir "$BASEDIR/files" rmdir "$BASEDIR/files"
} fi
env_sync env_sync
else else
rm -rf "$BASEDIR/.config" "$BASEDIR/files" rm -rf "$BASEDIR/.config" "$BASEDIR/files"