From e577bc851d557911b8b52815f84948a629087f64 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 16 Dec 2014 01:17:24 +0000 Subject: [PATCH] Fix for run scripts on Mac where install directory has a space. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9408 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/install.sh | 2 +- prism/src/bin/prism.darwin32 | 2 +- prism/src/bin/prism.darwin64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prism/install.sh b/prism/install.sh index 6d04fb13..26dea940 100755 --- a/prism/install.sh +++ b/prism/install.sh @@ -24,7 +24,7 @@ do if [ ! "$1" = "silent" ] ; then echo "Setting path in startup script $PRISM_DIR/$FILE_TO_CHANGE..." fi - if sed -e "s|PRISM_DIR=.*|PRISM_DIR=$PRISM_DIR|g" "$PRISM_DIR"/$FILE_TO_CHANGE > "$PRISM_DIR"/$TEMP_FILE ; then + if sed -e "s|PRISM_DIR=.*|PRISM_DIR=\"$PRISM_DIR\"|g" "$PRISM_DIR"/$FILE_TO_CHANGE > "$PRISM_DIR"/$TEMP_FILE ; then /bin/mv "$PRISM_DIR"/$TEMP_FILE "$PRISM_DIR"/$FILE_TO_CHANGE chmod 755 "$PRISM_DIR"/$FILE_TO_CHANGE else diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index 2f5a42af..5bd76694 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -65,7 +65,7 @@ fi ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png" # Run PRISM through Java -"$PRISM_JAVA" -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $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 "$ICON_OPTION" -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 caae8fa5..861a0f58 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -65,7 +65,7 @@ fi ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png" # Run PRISM through Java -"$PRISM_JAVA" -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $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 "$ICON_OPTION" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" PRISM_EXIT_CODE=$?