Look for QtWidgets in the right directory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52601 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/macosx/utility-launcher b/packaging/macosx/utility-launcher
index 48f00e5c6175194d6a021a14c706bcdb21d8253c..e8667a18e8d36dd8d91c930f21ebbf647e34e9fe 100755 (executable)
--- 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