aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-06-25 08:09:54 -0700
committerGerald Combs <gerald@wireshark.org>2019-06-25 15:13:51 +0000
commit867a13d9e61f9d98e224e811f44ae3984a02d0b2 (patch)
tree6f4fab535580c7949db8a8c5dc789d6dd9ad2f6c
parent641d4bbea41db4109f1614542cc7da18f371352c (diff)
Fix a couple of shellcheck issues.
Change-Id: Iaebbe5227ffcc581e794a3be1f8b9020fd600f68 Reviewed-on: https://code.wireshark.org/review/33739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rwxr-xr-ximage/stock_icons/svg-to-png.sh2
-rwxr-xr-xpackaging/macosx/osx-app.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/image/stock_icons/svg-to-png.sh b/image/stock_icons/svg-to-png.sh
index 60389bf60b..e37c503e89 100755
--- a/image/stock_icons/svg-to-png.sh
+++ b/image/stock_icons/svg-to-png.sh
@@ -13,7 +13,7 @@
COMMON_ARGS="--export-area-page"
-SVGCLEANER=$( type -p svgcleaner )
+#SVGCLEANER=$( type -p svgcleaner )
set_source_svgs() {
local out_icon=$1
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in
index 73ec0f6736..86fd93e1a5 100755
--- a/packaging/macosx/osx-app.sh.in
+++ b/packaging/macosx/osx-app.sh.in
@@ -372,7 +372,7 @@ rpathify_dir () {
#
# shellcheck disable=SC2086
files=$( ls $2 2>/dev/null )
- if [ ! -z "$files" ]; then
+ if [ -n "$files" ]; then
for file in $files; do
rpathify_file "$file" "$( pwd )"
done