osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup a couple of shellcheck "fixes". 

Change-Id: If3e6acf28c22cbc98a26c7e12c449e27fdc1321e
Reviewed-on: https://code.wireshark.org/review/28164
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-06-08 16:17:41 -07:00
parent 89540b9cba
commit 43a88c230f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packaging/macosx/osx-app.sh.in
View File

@ -225,9 +225,7 @@ rpathify_file () {
#
# OK, what type of file is this?
#
filetype=$( otool -hv "$1" | grep -E MH_MAGIC | awk '{print $5}' ; exit "${PIPESTATUS[0]}" )
RETVAL=$0
if [ "$RETVAL" -ne 0 ] ; then
if ! filetype=$( otool -hv "$1" | grep -E MH_MAGIC | awk '{print $5}' ; exit "${PIPESTATUS[0]}" ) ; then
echo "Unable to rpathify $1 in $( pwd ): file type failed."
exit 1
fi
@ -359,11 +357,14 @@ rpathify_dir () {
#
# Make sure we *have* files to fix
#
files=$( ls "$2" 2>/dev/null )
# shellcheck disable=SC2086
files=$( ls $2 2>/dev/null )
if [ ! -z "$files" ]; then
for file in $files; do
rpathify_file "$file" "$( pwd )"
done
else
echo "no files found in $1"
fi
)
rf_ret=$?