use one type of execute
replaced ` by $()
This commit is contained in:
parent
d975e38ef3
commit
4c08363b7f
16
s3h.sh
16
s3h.sh
@ -15,7 +15,7 @@ if [[ $# -eq 1 && -d "$1" ]]; then
|
|||||||
START_DIR="$1"
|
START_DIR="$1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
START_DIR=`realpath "$START_DIR"`
|
START_DIR=$(realpath "$START_DIR")
|
||||||
|
|
||||||
if [[ ! -d "$START_DIR" ]]; then
|
if [[ ! -d "$START_DIR" ]]; then
|
||||||
echo "start directory '$START_DIR' does not exist" >&2
|
echo "start directory '$START_DIR' does not exist" >&2
|
||||||
@ -29,11 +29,11 @@ LAST="$START_DIR/.last"
|
|||||||
# check if there was a last call, if so fake while loop variable
|
# check if there was a last call, if so fake while loop variable
|
||||||
preselect=''
|
preselect=''
|
||||||
if [[ -f "$LAST" ]]; then
|
if [[ -f "$LAST" ]]; then
|
||||||
last=`cat "$LAST"`
|
last=$(cat "$LAST")
|
||||||
# check if config file still exists
|
# check if config file still exists
|
||||||
if [[ -f "$last" ]]; then
|
if [[ -f "$last" ]]; then
|
||||||
dir=`dirname "$last"`
|
dir=$(dirname "$last")
|
||||||
preselect=`basename "$last"`
|
preselect=$(basename "$last")
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -53,12 +53,12 @@ while [[ -z "$configFile" ]]; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# add directory selectors
|
# add directory selectors
|
||||||
dirs=`find $dir -mindepth 1 -maxdepth 1 ! -name '.*' -type d -printf "%f\n" |sort`
|
dirs=$(find $dir -mindepth 1 -maxdepth 1 ! -name '.*' -type d -printf "%f\n" |sort)
|
||||||
for d in $dirs; do
|
for d in $dirs; do
|
||||||
para+=("$d" "<$d>")
|
para+=("$d" "<$d>")
|
||||||
done
|
done
|
||||||
# add file selectors
|
# add file selectors
|
||||||
files=`find $dir -mindepth 1 -maxdepth 1 ! -name '.*' -type f -printf "%f\n" |sort`
|
files=$(find $dir -mindepth 1 -maxdepth 1 ! -name '.*' -type f -printf "%f\n" |sort)
|
||||||
for d in $files; do
|
for d in $files; do
|
||||||
# text before ~ is tag
|
# text before ~ is tag
|
||||||
if [[ "$d" == *"~"* ]]; then
|
if [[ "$d" == *"~"* ]]; then
|
||||||
@ -97,7 +97,7 @@ while [[ -z "$configFile" ]]; do
|
|||||||
configFile=$ret
|
configFile=$ret
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
dir=`dirname "$dir"`
|
dir=$(dirname "$dir")
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ if [[ -f "$configFile" ]]; then
|
|||||||
echo "$configFile" > "$LAST"
|
echo "$configFile" > "$LAST"
|
||||||
|
|
||||||
# extract user@host if ~ in config file name
|
# extract user@host if ~ in config file name
|
||||||
login=`basename "$configFile"`
|
login=$(basename "$configFile")
|
||||||
if [[ "$login" == *"~"* ]]; then
|
if [[ "$login" == *"~"* ]]; then
|
||||||
login="${login#*~}"
|
login="${login#*~}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user