diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-01-04 03:05:14 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-01-04 11:06:19 +0000 |
commit | 2cc215c7d0b07c2be3d5d5908664f5e9b9bdc0de (patch) | |
tree | dedfb5007f8cd8726058f1dcc5de7243d4923412 /packaging/macosx/Scripts/wireshark-postinstall.sh | |
parent | 0aba97a938832f7b9ffe6ec6531cc41b2d96f998 (diff) |
Running Wireshark through a symlink doesn't work.
We can't just symbolically link to the executables, as that means that
the executable won't be in Contents/MacOS, which means that all
@executable_path-relative references will go to the wrong place if we
run the executables using the symlink, which means that the executables
could fail (they *do* fail to find the Cocoa Qt plugin, for example).
So, instead, we go back to the old version of the utility launcher, and
put that in Contents/Resources/bin as well as, if the user requests the
CLI utilities, /usr/local/bin. Maybe PackageMaker will find that
acceptable and include them in the installer package.
Bug: 13270
Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
Reviewed-on: https://code.wireshark.org/review/19536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx/Scripts/wireshark-postinstall.sh')
-rwxr-xr-x | packaging/macosx/Scripts/wireshark-postinstall.sh | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/packaging/macosx/Scripts/wireshark-postinstall.sh b/packaging/macosx/Scripts/wireshark-postinstall.sh index 96ed64d89b..98c0e683cd 100755 --- a/packaging/macosx/Scripts/wireshark-postinstall.sh +++ b/packaging/macosx/Scripts/wireshark-postinstall.sh @@ -19,26 +19,10 @@ 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. -# -if [ ! -d "$BIN_PATH" ] -then - mkdir -m u=rwx,g=rx,o=rx "$BIN_PATH" -fi -for i in capinfos dftest dumpcap editcap mergecap randpkt rawshark \ - tshark text2pcap -do - ln -s ../../MacOS/"$i" "$BIN_PATH/$i" -done -ln -s ../../MacOS/Wireshark "$BIN_PATH/wireshark" - # Setting PATH # if /etc/paths.d/Wireshark already exists we overwrite it. # -WSPATH="$BIN_PATH" +WSPATH="$2/Wireshark.app/Contents/MacOS" if [ ! -d /etc/paths.d ] then |