diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-14 17:23:58 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-14 17:23:58 +0000 |
| commit | 9011036f761f46bd6c7d6d6f4e407f274bcc4ea9 (patch) | |
| tree | c3a9b7ea484fad2e321492c93f0023cc24590d82 /packaging/macosx | |
| parent | 13c1c9daf7bbc5f976a39fac412319d77e22ae51 (diff) | |
Look for QtWidgets in the right directory.
svn path=/trunk/; revision=52601
Diffstat (limited to 'packaging/macosx')
| -rwxr-xr-x | packaging/macosx/utility-launcher | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/packaging/macosx/utility-launcher b/packaging/macosx/utility-launcher index 48f00e5c61..e8667a18e8 100755 --- a/packaging/macosx/utility-launcher +++ b/packaging/macosx/utility-launcher @@ -18,15 +18,16 @@ if [ ! -d "$WIRESHARK_APP_DIR" ] ; then exit 1 fi -APPNAME=`basename "$0"` +APP_NAME=`basename "$0"` -if [ -f "$WIRESHARK_APP_DIR/Frameworks/QtWidgets" -o -d "$WIRESHARK_APP_DIR/Frameworks/QtWidgets.framework" ] ; then +APP_CONTENTS="$WIRESHARK_APP_DIR/Contents" +if [ -f "$APP_CONTENTS/Frameworks/QtWidgets" -o -d "$APP_CONTENTS/Frameworks/QtWidgets.framework" ] ; then # Qt - if [ "$APPNAME" = "wireshark" ] ; then - APPNAME=Wireshark + if [ "$APP_NAME" = "wireshark" ] ; then + APP_NAME=Wireshark fi - exec "$WIRESHARK_APP_DIR/Contents/MacOS/$APPNAME" "$@" + exec "$APP_CONTENTS/MacOS/$APP_NAME" "$@" else # GTK+ - exec "$WIRESHARK_APP_DIR/Contents/Resources/bin/$APPNAME" "$@" + exec "$APP_CONTENTS/Resources/bin/$APP_NAME" "$@" fi |