summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2024-01-07 18:37:11 +0100
committerMarkus Heiser <markus.heiser@darmarIT.de>2024-01-09 16:31:19 +0100
commit54a6626582d199d5e9914628ac68ffc9c3611628 (patch)
tree8e6a156ac1299a12871ee616b670d321f50ce731
parentf9c5727ddc74b9ee3bb95225c30f57c7aeb14806 (diff)
[fix] issues reported by shellcheck v0.9.0
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
-rwxr-xr-xutils/lib.sh8
-rwxr-xr-xutils/lib_sxng_static.sh2
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/lib.sh b/utils/lib.sh
index afc6ef19..16bfb439 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -194,6 +194,7 @@ wait_key(){
[[ -n $FORCE_TIMEOUT ]] && _t=$FORCE_TIMEOUT
[[ -n $_t ]] && _t="-t $_t"
printf "$msg"
+ # shellcheck disable=SC2229
# shellcheck disable=SC2086
read -r -s -n1 $_t || true
echo
@@ -227,7 +228,7 @@ ask_yn() {
while true; do
clean_stdin
printf "$1 ${choice} "
- # shellcheck disable=SC2086
+ # shellcheck disable=SC2086,SC2229
read -r -n1 $_t
if [[ -z $REPLY ]]; then
printf "$default\n"; break
@@ -261,7 +262,7 @@ tee_stderr () {
if [[ -n $1 ]] ; then _t="$1"; fi
(while read -r line; do
- # shellcheck disable=SC2086
+ # shellcheck disable=SC2086,SC2229
sleep $_t
echo -e "$line" >&2
echo "$line"
@@ -367,7 +368,7 @@ choose_one() {
printf "$1 [${_BGreen}$default${_creset}] "
if (( 10 > max )); then
- # shellcheck disable=SC2086
+ # shellcheck disable=SC2086,SC2229
read -r -n1 $_t
else
# shellcheck disable=SC2086,SC2229
@@ -708,6 +709,7 @@ pyenv.uninstall() {
pyenv.cmd python setup.py develop --uninstall 2>&1 \
| prefix_stdout "${_Blue}PYENV ${_creset}[pyenv.uninstall] "
else
+ # shellcheck disable=SC2086
pyenv.cmd python -m pip uninstall --yes ${PYOBJECTS} 2>&1 \
| prefix_stdout "${_Blue}PYENV ${_creset}[pyenv.uninstall] "
fi
diff --git a/utils/lib_sxng_static.sh b/utils/lib_sxng_static.sh
index de34ea62..8271cc14 100755
--- a/utils/lib_sxng_static.sh
+++ b/utils/lib_sxng_static.sh
@@ -37,7 +37,7 @@ is.static.build.commit() {
# check all files of the commit belongs to $STATIC_BUILT_PATHS
commit_files=$(git diff-tree --no-commit-id --name-only -r "${commit_sha}")
- for i in ${STATIC_BUILT_PATHS[*]}; do
+ for i in "${STATIC_BUILT_PATHS[@]}"; do
# remove files of ${STATIC_BUILT_PATHS}
commit_files=$(echo "${commit_files}" | grep -v "^${i}")
done