From 2cc2c2f883b4ce4ca8420877816332086e096940 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 3 Jan 2017 20:42:12 -0800 Subject: Put symlinks to the executables in Contents/Resources/bin. PackageMaker appears not to put them into the installer package, so construct them in the Wireshark post-install script. Bug: 13270 Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7 Reviewed-on: https://code.wireshark.org/review/19531 Reviewed-by: Guy Harris --- packaging/macosx/Scripts/wireshark-postinstall.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/macosx/Scripts/wireshark-postinstall.sh b/packaging/macosx/Scripts/wireshark-postinstall.sh index bfaedca1dd..3850a4bc75 100755 --- a/packaging/macosx/Scripts/wireshark-postinstall.sh +++ b/packaging/macosx/Scripts/wireshark-postinstall.sh @@ -19,10 +19,22 @@ do rm -f "$PLUGINS_PATH"/$plugin.so "$PLUGINS_PATH"/$plugin.la done +BIN_PATH="$2/Wireshark.app/Contents/Resources/bin" +# +# For some reason, packagemaker isn't including Contents/Resources/bin +# in the app bundle, so let's just construct it ourselves. +# +for i in capinfos dftest dumpcap editcap mergecap randpkt rawshark \ + tshark text2pcap +do + ln -s "$BIN_PATH/$i" ../../MacOS/"$i" +done +ln -s "$BIN_PATH/wireshark" ../../MacOS/Wireshark + # Setting PATH # if /etc/paths.d/Wireshark already exists we overwrite it. # -WSPATH="$2/Wireshark.app/Contents/Resources/bin" +WSPATH="$BIN_PATH" if [ ! -d /etc/paths.d ] then -- cgit v1.2.1