aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-02-03 16:58:24 -0800
committerGuy Harris <guy@alum.mit.edu>2018-02-04 00:58:58 +0000
commit656c42646a5b22ee4068e1b0fa6405bdd9d9d2f9 (patch)
treeac54bd096828eb7e6cb046a19830d3ab7a69e1be /packaging
parent0c781eeef7a5322de2e96bb77b1029db35b4b2bc (diff)
Process all subdirectories of $pkgplugin as directories of plugins.
That way we don't have to change the script if we add new plugin subdirectories. Change-Id: Ic788807c723306e461b7c1f8721b48a46d4fff96 Reviewed-on: https://code.wireshark.org/review/25584 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-app.sh.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in
index 0dfdfc5600..c6361e3b2a 100755
--- a/packaging/macosx/osx-app.sh.in
+++ b/packaging/macosx/osx-app.sh.in
@@ -468,8 +468,10 @@ rpathify_files () {
#
rpathify_dir "$pkglib" "*.dylib"
rpathify_dir "$pkgexec" "*"
- rpathify_dir "$pkgplugin/epan" "*"
- rpathify_dir "$pkgplugin/wiretap" "*"
+ for plugindir in "$pkgplugin"/*
+ do
+ rpathify_dir "$plugindir" "*"
+ done
rpathify_dir "$pkgexec/extcap" "*"
}
@@ -522,7 +524,7 @@ if [ -n "$CODE_SIGN_IDENTITY" ] ; then
done
echo "Signing plugins"
- for plugin in $pkgplugin/epan/*.so $pkgplugin/wiretap/*.so ; do
+ for plugin in $pkgplugin/*/*.so ; do
codesign_file "$plugin"
done