# HG changeset patch
# User wenzelm
# Date 1539805349 -7200
# Node ID 77eede3f40e26a81cb817d7ecffe4fc770f12f07
# Parent  b310bc57f55f6cad79ee4ab42c647991bf5b48d7
enforce settings that are likely to be outdated, e.g. in $ISABELLE_HOME_USER/etc/settings;

diff -r b310bc57f55f -r 77eede3f40e2 lib/scripts/getsettings
--- a/lib/scripts/getsettings	Wed Oct 17 21:38:07 2018 +0200
+++ b/lib/scripts/getsettings	Wed Oct 17 21:42:29 2018 +0200
@@ -99,16 +99,18 @@
   ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}"
 fi
 
-#OCaml
-if [ -z "$ISABELLE_OCAML" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocaml" ]; then
+#enforce ISABELLE_OCAML
+if [ -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocaml" ]; then
   ISABELLE_OCAML="$ISABELLE_HOME/lib/Tools/ocaml"
 fi
-if [ -z "$ISABELLE_OCAMLC" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocamlc" ]; then
+
+#enforce ISABELLE_OCAMLC
+if [ -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocamlc" ]; then
   ISABELLE_OCAMLC="$ISABELLE_HOME/lib/Tools/ocamlc"
 fi
 
-#GHC
-if [ -z "$ISABELLE_GHC" -a -d "$ISABELLE_STACK_ROOT" -a -f "$(isabelle_stack path --programs)/$ISABELLE_GHC_VERSION/ghc" ]; then
+#enforce ISABELLE_GHC
+if [ -d "$ISABELLE_STACK_ROOT" -a -f "$(isabelle_stack path --programs)/$ISABELLE_GHC_VERSION/ghc" ]; then
   ISABELLE_GHC="$ISABELLE_HOME/lib/Tools/ghc"
 fi