# HG changeset patch
# User wenzelm
# Date 1456424533 -3600
# Node ID cb6c4e307b1c7a97b7b5f3a28f1522eea86b0364
# Parent  62c03eb38e49636f30555abea3d6cf89470f0c8b
slightly more robust re-initialization;

diff -r 62c03eb38e49 -r cb6c4e307b1c lib/scripts/getfunctions
--- a/lib/scripts/getfunctions	Thu Feb 25 19:08:48 2016 +0100
+++ b/lib/scripts/getfunctions	Thu Feb 25 19:22:13 2016 +0100
@@ -6,11 +6,7 @@
 # non-interactive bash processess. NB: bash shell functions are not portable
 # and may be dropped by aggressively POSIX-conformant versions of /bin/sh.
 
-if [ -z "$ISABELLE_SETTINGS_PRESENT" ]
-then
-  echo 1>&2 "Missing Isabelle settings environment"
-  exit 2
-elif type splitarray >/dev/null 2>/dev/null
+if type splitarray >/dev/null 2>/dev/null
 then
   :
 else
diff -r 62c03eb38e49 -r cb6c4e307b1c lib/scripts/getsettings
--- a/lib/scripts/getsettings	Thu Feb 25 19:08:48 2016 +0100
+++ b/lib/scripts/getsettings	Thu Feb 25 19:22:13 2016 +0100
@@ -4,14 +4,17 @@
 #
 # Static Isabelle environment for root of process tree.
 
+export ISABELLE_HOME
+
+export BASH_ENV="$ISABELLE_HOME/lib/scripts/getfunctions"
+source "$BASH_ENV"
+
+
 if [ -z "$ISABELLE_SETTINGS_PRESENT" ]
 then
 
 export ISABELLE_SETTINGS_PRESENT=true
 
-export BASH_ENV="$ISABELLE_HOME/lib/scripts/getfunctions"
-source "$BASH_ENV"
-
 set -o allexport
 
 #sane environment defaults (notably on Mac OS X)
@@ -50,8 +53,6 @@
   unset CLASSPATH
 fi
 
-export ISABELLE_HOME
-
 #main executables
 ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
 ISABELLE_PROCESS="$ISABELLE_HOME/bin/isabelle_process"