From 7615d9fcd8fdf059627f55c765c47b6c23a9debb Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Wed, 31 Aug 2016 22:08:38 +0000
Subject: [PATCH] Fix handling of PRISM_DEBUG and PRISM_DEBUG_ARG variables in
 launch scripts so that the scripts work when they are not set.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11767 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/bin/prism.cygwin   | 9 ++++++++-
 prism/src/bin/prism.darwin32 | 9 ++++++++-
 prism/src/bin/prism.darwin64 | 9 ++++++++-
 prism/src/bin/prism.linux    | 9 ++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin
index d2d18eea..7ba3346e 100644
--- a/prism/src/bin/prism.cygwin
+++ b/prism/src/bin/prism.cygwin
@@ -71,5 +71,12 @@ fi
 PRISM_CLASSPATH_WIN=`cygpath -wp $"$PRISM_CLASSPATH"`
 JAVA_LIBRARY_PATH_WIN=`cygpath -wp "$JAVA_LIBRARY_PATH"`
 
+# If debugging enabled, set up vars accordingly
+if [ "$PRISM_DEBUG" != "" ]; then
+	PRISM_JAVA_ARG1="$PRISM_JAVA"
+	PRISM_JAVA_ARG2="$PRISM_DEBUG_ARG"
+	PRISM_JAVA="$PRISM_DEBUG"
+fi
+
 # Run PRISM through Java
-"$PRISM_DEBUG" "$PRISM_DEBUG_ARG" "$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH_WIN" -classpath "$PRISM_CLASSPATH_WIN" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH_WIN" -classpath "$PRISM_CLASSPATH_WIN" $PRISM_MAINCLASS "$@"
diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32
index 2daeb55f..c29b58db 100755
--- a/prism/src/bin/prism.darwin32
+++ b/prism/src/bin/prism.darwin32
@@ -84,8 +84,15 @@ fi
 PRISM_ICON="-Xdock:icon=$PRISM_DIR/etc/icons/p64.png"
 PRISM_DOCK_NAME="-Xdock:name=PRISM"
 
+# If debugging enabled, set up vars accordingly
+if [ "$PRISM_DEBUG" != "" ]; then
+	PRISM_JAVA_ARG1="$PRISM_JAVA"
+	PRISM_JAVA_ARG2="$PRISM_DEBUG_ARG"
+	PRISM_JAVA="$PRISM_DEBUG"
+fi
+
 # Run PRISM through Java
-"$PRISM_DEBUG" "$PRISM_DEBUG_ARG" "$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_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 -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 73f49016..dd1e73b0 100755
--- a/prism/src/bin/prism.darwin64
+++ b/prism/src/bin/prism.darwin64
@@ -84,8 +84,15 @@ fi
 PRISM_ICON="-Xdock:icon=$PRISM_DIR/etc/icons/p64.png"
 PRISM_DOCK_NAME="-Xdock:name=PRISM"
 
+# If debugging enabled, set up vars accordingly
+if [ "$PRISM_DEBUG" != "" ]; then
+	PRISM_JAVA_ARG1="$PRISM_JAVA"
+	PRISM_JAVA_ARG2="$PRISM_DEBUG_ARG"
+	PRISM_JAVA="$PRISM_DEBUG"
+fi
+
 # Run PRISM through Java
-"$PRISM_DEBUG" "$PRISM_DEBUG_ARG" "$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_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 -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=$?
 
diff --git a/prism/src/bin/prism.linux b/prism/src/bin/prism.linux
index 3222d482..eca775d3 100755
--- a/prism/src/bin/prism.linux
+++ b/prism/src/bin/prism.linux
@@ -75,8 +75,15 @@ if [ "$PRISM_HEADLESS" = "" ]; then
 	PRISM_HEADLESS=true
 fi
 
+# If debugging enabled, set up vars accordingly
+if [ "$PRISM_DEBUG" != "" ]; then
+	PRISM_JAVA_ARG1="$PRISM_JAVA"
+	PRISM_JAVA_ARG2="$PRISM_DEBUG_ARG"
+	PRISM_JAVA="$PRISM_DEBUG"
+fi
+
 # Run PRISM through Java
-"$PRISM_DEBUG" "$PRISM_DEBUG_ARG" "$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
 
 PRISM_EXIT_CODE=$?