macOS: Use the correct path when building our app bundle.
authorGerald Combs <gerald@wireshark.org>
Mon, 25 Nov 2019 02:05:14 +0000 (20:05 -0600)
committerGerald Combs <gerald@wireshark.org>
Mon, 25 Nov 2019 02:10:02 +0000 (02:10 +0000)
Use the correct path to the Wireshark executable when finding
dependencies and adding debugging symbols.

Change-Id: Iefafa9d453ce60e77853f2d125769826b4d702c0
Reviewed-on: https://code.wireshark.org/review/35202
Reviewed-by: Gerald Combs <gerald@wireshark.org>
packaging/macosx/osx-app.sh.in

index 152e4d6c4dfae7267850b277e54c556cb620b8ec..04e3764474963d01e030d0ab39f5fdd67b920875 100755 (executable)
@@ -137,7 +137,7 @@ pkgplugin="$bundle/Contents/PlugIns/wireshark/@PLUGIN_PATH_ID@"
 #
 secondary_binary_list=$( find $pkgexec \! -name Wireshark -type f -perm -0555 -print | sort )
 plugin_library_list=$( find $pkgplugin -name "*.so" -type f -perm -0555 -print | sort )
-bundle_binary_list="Wireshark $secondary_binary_list $plugin_library_list"
+bundle_binary_list="$pkgexec/Wireshark $secondary_binary_list $plugin_library_list"
 
 echo -e "\\nFixing up $bundle..."