refactor!(posix): translate complex [[ bashisms (shellcheck SC3014)

This commit is contained in:
AJ ONeal
2022-08-21 04:57:46 +00:00
parent 0d611cb246
commit 0a8675427c
2 changed files with 18 additions and 4 deletions

View File

@@ -182,12 +182,12 @@ __webi_main() {
echo ""
}
if [ \$# -eq 0 ] || [[ "\$1" =~ ^(-V|--version|version)$ ]]; then
if [ \$# -eq 0 ] || echo "\$1" | grep -q -E '^(-V|--version|version)$'; then
version
exit 0
fi
if [[ "\$1" =~ ^(-h|--help|help)$ ]]; then
if echo "\$1" | grep -q -E '^(-h|--help|help)$'; then
usage "\$@"
exit 0
fi

View File

@@ -137,6 +137,20 @@ __bootstrap_webi() {
export PATH="$my_path"
}
is_interactive_shell() {
# $- shows shell flags (error,unset,interactive,etc)
case $- in
*i*)
# true
return 0
;;
*)
# false
return 1
;;
esac
}
# detect if file is downloaded, and how to download it
webi_download() {
# determine the url to download
@@ -181,7 +195,7 @@ __bootstrap_webi() {
# TODO wget -c --content-disposition "$my_url"
set +e
my_show_progress=""
if [[ $- == *i* ]]; then
if is_interactive_shell; then
my_show_progress="--show-progress"
fi
if ! wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"; then
@@ -193,7 +207,7 @@ __bootstrap_webi() {
# Neither GNU nor BSD curl have sane resume download options, hence we don't bother
# TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url"
my_show_progress="-#"
if [[ $- == *i* ]]; then
if is_interactive_shell; then
my_show_progress=""
fi
# shellcheck disable=SC2086