more robust treatment of spaces in file names;
authorwenzelm
Mon, 15 Nov 2010 17:14:43 +0100
changeset 40545 956c2cc7fced
parent 40544 34e56a6668ba
child 40546 f46c902a8438
more robust treatment of spaces in file names;
etc/settings
src/HOL/Tools/Predicate_Compile/etc/settings
src/Tools/Code/etc/settings
--- a/etc/settings	Mon Nov 15 15:41:58 2010 +0100
+++ b/etc/settings	Mon Nov 15 17:14:43 2010 +0100
@@ -18,13 +18,13 @@
 # Poly/ML 5.x (automated settings)
 POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
 ML_PLATFORM="$ISABELLE_PLATFORM"
-ML_HOME=$(choosefrom \
+ML_HOME="$(choosefrom \
   "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
   "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
   "/usr/local/polyml/$ML_PLATFORM" \
   "/usr/share/polyml/$ML_PLATFORM" \
   "/opt/polyml/$ML_PLATFORM" \
-  $POLY_HOME)
+  "$POLY_HOME")"
 ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
 ML_OPTIONS="-H 200"
 ML_SOURCES="$ML_HOME/../src"
@@ -170,13 +170,13 @@
 ###
 
 # Proof General home, look in a variety of places
-PROOFGENERAL_HOME=$(choosefrom \
+PROOFGENERAL_HOME="$(choosefrom \
   "$ISABELLE_HOME/contrib/ProofGeneral" \
   "$ISABELLE_HOME/../ProofGeneral" \
   "/usr/local/ProofGeneral" \
   "/usr/share/ProofGeneral" \
   "/opt/ProofGeneral" \
-  "")
+  "")"
 
 PROOFGENERAL_OPTIONS=""
 #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"
--- a/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 15:41:58 2010 +0100
+++ b/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 17:14:43 2010 +0100
@@ -1,16 +1,17 @@
+# -*- shell-script -*- :mode=shellscript:
 
-EXEC_SWIPL=$(choosefrom \
+EXEC_SWIPL="$(choosefrom \
   "$ISABELLE_HOME/contrib/swipl/$ISABELLE_PLATFORM/bin/swipl" \
   "$ISABELLE_HOME/contrib_devel/swipl/$ISABELLE_PLATFORM/bin/swipl" \
   "$ISABELLE_HOME/../swipl" \
   $(type -p swipl) \
-  "")
+  "")"
 
-EXEC_YAP=$(choosefrom \
+EXEC_YAP="$(choosefrom \
   "$ISABELLE_HOME/contrib/yap/$ISABELLE_PLATFORM/bin/yap" \
   "$ISABELLE_HOME/contrib_devel/yap/$ISABELLE_PLATFORM/bin/yap" \
   "$ISABELLE_HOME/../yap" \
   $(type -p yap) \
-  "")
+  "")"
 
 SWIPL_VERSION=$("$COMPONENT/lib/scripts/swipl_version")
--- a/src/Tools/Code/etc/settings	Mon Nov 15 15:41:58 2010 +0100
+++ b/src/Tools/Code/etc/settings	Mon Nov 15 17:14:43 2010 +0100
@@ -1,14 +1,15 @@
+# -*- shell-script -*- :mode=shellscript:
 
 ISABELLE_TOOLS="$ISABELLE_TOOLS:$COMPONENT/lib/Tools"
 
-EXEC_GHC=$(choosefrom \
+EXEC_GHC="$(choosefrom \
   "$ISABELLE_HOME/contrib/ghc/$ISABELLE_PLATFORM/ghc" \
   "$ISABELLE_HOME/../ghc/$ISABELLE_PLATFORM/ghc" \
-  $(type -p ghc) \
-  "")
+  "$(type -p ghc)" \
+  "")"
 
-EXEC_OCAML=$(choosefrom \
+EXEC_OCAML="$(choosefrom \
   "$ISABELLE_HOME/contrib/ocaml/$ISABELLE_PLATFORM/ocaml" \
   "$ISABELLE_HOME/../ocaml/$ISABELLE_PLATFORM/ocaml" \
-  $(type -p ocaml) \
-  "")
+  "$(type -p ocaml)" \
+  "")"