From 0a0c0c4bf56ec1a3e9bd979083e5bd4f0a269672 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 13 Mar 2018 10:48:14 -0500 Subject: [PATCH] Shellcheck (#23) * Use ${var:?} to ensure this never expands to /* . https://github.com/koalaman/shellcheck/wiki/SC2115 * Quote this to prevent word splitting https://github.com/koalaman/shellcheck/wiki/SC2046 --- update_ombi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update_ombi.sh b/update_ombi.sh index 3a4dca3..934a923 100644 --- a/update_ombi.sh +++ b/update_ombi.sh @@ -101,7 +101,7 @@ unzip-strip() ( cp -r "$temp"/*/* "$dest" else cp -r "$temp"/* "$dest" - fi && rm -rf "$temp"/* "$temp" + fi && rm -rf "${temp:?}"/* "$temp" ) # Import any custom config to override the defaults, if necessary @@ -222,7 +222,7 @@ tempdir=$(mktemp -d) file="$tempdir/ombi_$version.tar.gz" wget --quiet --show-progress -O $file "https://ci.appveyor.com/api/buildjobs/$jobId/artifacts/$filename" .log 6 "Version $version downloaded...checking file size..." -if [ $(wc -c < $file) != $size ]; then +if [ "$(wc -c < $file)" != $size ]; then .log 3 "Downloaded file size does not match expected file size...bailing!" exit 2 fi @@ -321,7 +321,7 @@ else fi .log 6 "Cleaning up..." -rm -rf "$tempdir"/* "$tempdir" +rm -rf "${tempdir:?}"/* "$tempdir" declare -i elapsedtime=$SECONDS declare -i minutes=0 declare -i seconds=0