diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-06-26 09:07:16 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-06-26 16:13:57 +0000 |
| commit | e5230a5d1010abab56194581f0090d7e083d16e1 (patch) | |
| tree | 8fa3eb3603dfcf7d1bc718986f37992c13276a2f /packaging | |
| parent | ca62d2c009021869dedde41c855c5588305540e8 (diff) | |
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>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/osx-app.sh.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in index 86fd93e1a5..6de11f41a9 100755 --- a/packaging/macosx/osx-app.sh.in +++ b/packaging/macosx/osx-app.sh.in @@ -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 ) |