Fix all Shellcheck SC2086 violations.

pull/143/head
Ben Peachey 3 years ago committed by Joseph Werle
parent 0485cbd0ba
commit 355a1bd49d

@ -42,7 +42,7 @@ features () {
for ((i = 0; i < ${#features[@]}; ++i)); do
local f="${features[$i]}"
if ! type "${f}" > /dev/null 2>&1; then
error "Missing "${f}" dependency"
error "Missing \"${f}\" dependency"
return 1
fi
done

@ -37,7 +37,7 @@ bpkg_getdeps () {
for (( i = 0; i < ${#dependencies[@]} ; ++i )); do
(
local package=${dependencies[$i]}
bpkg install ${package}
bpkg install "${package}"
)
done
return 0

@ -1,7 +1,7 @@
#!/bin/bash
## sets optional variable from environment
opt () { eval "if [ -z "\${$1}" ]; then ${1}='${2}'; fi"; }
opt () { eval "if [ -z \"\${$1}\" ]; then ${1}='${2}'; fi"; }
## output usage
usage () {
@ -23,7 +23,7 @@ prompt () {
value="${value//\"/\'}";
} 2>&1
if [ ! -z "${value}" ]; then
eval "${var}"=\"${value}\"
eval "${var}=\"${value}\""
fi
}
@ -135,6 +135,7 @@ csv () {
SCRIPTS="${SCRIPTS//,/ }"
SCRIPTS="${SCRIPTS//\"/}"
SCRIPTS="${SCRIPTS//\'/}"
# shellcheck disable=SC2086
SCRIPTS=($(wrap ${SCRIPTS}))
let len=${#SCRIPTS[@]}
for (( i = 0; i < len; i++ )); do

@ -57,7 +57,7 @@ awk_egrep () {
print token;
$0=substr($0, start+RLENGTH);
}
}' pattern=$pattern_string
}' pattern="$pattern_string"
}
tokenize () {

@ -57,14 +57,14 @@ bpkg_list () {
fi
OLDIFS="$IFS"
IFS=$'\n'
for line in $(cat $BPKG_REMOTE_INDEX_FILE); do
for line in $(cat "$BPKG_REMOTE_INDEX_FILE"); do
local name=$(echo "$line" | cut -d\| -f1 | tr -d ' ')
local desc=$(echo "$line" | cut -d\| -f2)
local host=$BPKG_REMOTE_HOST
if [ "$verbose" == "1" ]; then
echo "$name [$host] - $desc"
else
echo $name
echo "$name"
fi
done
IFS="$OLDIFS"

@ -172,7 +172,7 @@ bpkg_show () {
OLDIFS="$IFS"
IFS=$'\n'
for line in $(cat $BPKG_REMOTE_INDEX_FILE); do
for line in $(cat "$BPKG_REMOTE_INDEX_FILE"); do
local name=$(echo "$line" | cut -d\| -f1 | tr -d ' ')
local desc=$(echo "$line" | cut -d\| -f2)
if [ "$name" == "$pkg" ]; then

@ -67,7 +67,7 @@ suggest () {
if [ -z "${res}" ]; then
continue
fi
res="$(echo ${res} | tr '\n' ' ')"
res="$(echo "${res}" | tr '\n' ' ')"
## add to found count
found+=( $(echo -n "${res}") )
fi
@ -83,7 +83,7 @@ suggest () {
printf "suggest: found %d result(s)\n" "${count}"
echo
for (( i = 0; i < count; ++i )); do
printf "%d %s\n" $(echo -n ${found[$i]} | wc -c | tr -d ' ') "${found[$i]}"
printf "%d %s\n" "$(echo -n "${found[$i]}" | wc -c | tr -d ' ')" "${found[$i]}"
done | sort -n | awk '{ print $2 }' | xargs printf ' %s\n'
else
echo "suggest: Couldn't anything to match \`${query}'"

@ -57,7 +57,7 @@ term_move () {
(( _y = y ))
## write
printf "\e[%d;%d;f" ${y} ${x}
printf "\e[%d;%d;f" "${y}" "${x}"
return 0
}

@ -40,11 +40,11 @@ bpkg_update_remote() {
fi
#echo "curl -slo- $auth '$wiki_url' | grep -o '\[.*\](.*).*'"
repo_list=$(curl -sLo- $auth "$wiki_url" | grep -o '\[.*\](.*).*' | sed 's/\[\(.*\)\](.*)[ \-]*/\1|/' )
repo_list=$(curl -sLo- "$auth" "$wiki_url" | grep -o '\[.*\](.*).*' | sed 's/\[\(.*\)\](.*)[ \-]*/\1|/' )
num_repos=$(echo "$repo_list" | wc -l | tr -d ' ')
bpkg_info "indexing ${num_repos} repos from $BPKG_REMOTE_HOST to $index_file"
echo "$repo_list" > $index_file
echo "$repo_list" > "$index_file"
}
bpkg_update () {

@ -78,7 +78,7 @@ make_install () {
local source=$(<$BIN)
[ -f "$source" ] && install "$source" "$PREFIX/bin/$BIN" || install "$BIN" "$PREFIX/bin"
for cmd in $CMDS; do
source=$(<$BIN-$cmd)
source=$(<"$BIN-$cmd")
[ -f "$source" ] && install "$source" "$PREFIX/bin/$BIN-$cmd" || install "$BIN-$cmd" "$PREFIX/bin"
done
return $?
@ -108,5 +108,5 @@ make_unlink () {
}
## go
[ $# -eq 0 ] && setup || make_$1
[ $# -eq 0 ] && setup || "make_$1"
exit $?

Loading…
Cancel
Save