osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

macOS: Make sure we bundle our plugin dependencies. 

Add our plugins to the bundle binary list.

Copy libraries using `install` in order to ensure that we can doctor
them up.

Bug: 15867
Change-Id: I864455f6ef7312938e89493015fd55874ab0a0c3
Reviewed-on: https://code.wireshark.org/review/33744
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2019-06-26 09:07:16 -07:00
parent ca62d2c009
commit e5230a5d10
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,8 @@ pkgplugin="$bundle/Contents/PlugIns/wireshark/@PLUGIN_PATH_ID@"
# binaries.
#
secondary_binary_list=$( find $pkgexec \! -name Wireshark -type f -perm -0555 -print | sort )
bundle_binary_list="Wireshark $secondary_binary_list"
plugin_library_list=$( find $pkgplugin -name "*.so" -type f -perm -0555 -print | sort )
bundle_binary_list="Wireshark $secondary_binary_list $plugin_library_list"
echo -e "\\nFixing up $bundle..."
@ -195,7 +196,7 @@ while $endl; do
| uniq \
)"
# shellcheck disable=SC2086
cp -vn $libs "$pkglib"
install -m 644 -C -v $libs "$pkglib"
(( a++ ))
# shellcheck disable=SC2012
nnfiles=$( ls "$pkglib" | wc -l )