diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-12-15 17:48:59 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-16 01:49:43 +0000 |
| commit | d706f9c221e85992f7011baed53f5b31b7109493 (patch) | |
| tree | f2cd39bf00a9d33ed061dc8a0aa6b05f3e3dfe65 /packaging/macosx/utility-launcher | |
| parent | 8234de535022a699f6c2ac5f870cad6cd7439060 (diff) | |
| download | wireshark-d706f9c221e85992f7011baed53f5b31b7109493.tar.gz | |
Add symlinks to Wireshark binaries in Resources/bin, and point there.
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
the man command will look in
.../Wireshark.app/Contents/Resources/share/man.
This also may obviate the need to install the wrapper scripts in
/usr/local/bin, although those scripts obviate the need to re-set PATH
after installing Wireshark.
Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
Reviewed-on: https://code.wireshark.org/review/19296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx/utility-launcher')
| -rwxr-xr-x | packaging/macosx/utility-launcher/wireshark | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/packaging/macosx/utility-launcher/wireshark b/packaging/macosx/utility-launcher/wireshark index e412a5024c..383730f493 100755 --- a/packaging/macosx/utility-launcher/wireshark +++ b/packaging/macosx/utility-launcher/wireshark @@ -18,14 +18,4 @@ fi APP_NAME=`basename "$0"` -APP_CONTENTS="$WIRESHARK_APP_DIR/Contents" -if [ -f "$APP_CONTENTS/Frameworks/QtWidgets" -o -d "$APP_CONTENTS/Frameworks/QtWidgets.framework" ] ; then - # Qt - if [ "$APP_NAME" = "wireshark" ] ; then - APP_NAME=Wireshark - fi - exec "$APP_CONTENTS/MacOS/$APP_NAME" "$@" -else - # GTK+ - exec "$APP_CONTENTS/Resources/bin/$APP_NAME" "$@" -fi +exec "$WIRESHARK_APP_DIR/Contents/Resources/bin/$APP_NAME" "$@" |