From 6fb7606632d9f56cf7450f111422c26fa9c96a13 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 6 Jul 2015 10:35:56 +0000 Subject: [PATCH] Bug fix in Mac launch scripts (icon, dock name) git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10190 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/bin/prism.darwin32 | 5 +++-- prism/src/bin/prism.darwin64 | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index 57039536..8c12b698 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -75,10 +75,11 @@ if [ "$PRISM_HEADLESS" = "" ]; then PRISM_HEADLESS=true fi -ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png" +PRISM_ICON="-Xdock:icon=$PRISM_DIR/etc/icons/p64.png" +PRISM_DOCK_NAME="-Xdock:name=PRISM" # Run PRISM through Java -"$PRISM_JAVA" -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$ICON_OPTION" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" +"$PRISM_JAVA" -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" PRISM_EXIT_CODE=$? diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64 index 61f7faf7..4bd8b3f0 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -75,10 +75,11 @@ if [ "$PRISM_HEADLESS" = "" ]; then PRISM_HEADLESS=true fi -ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png" +PRISM_ICON="-Xdock:icon=$PRISM_DIR/etc/icons/p64.png" +PRISM_DOCK_NAME="-Xdock:name=PRISM" # Run PRISM through Java -"$PRISM_JAVA" -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$ICON_OPTION" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" +"$PRISM_JAVA" -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" PRISM_EXIT_CODE=$?