slightly more robust re-initialization;
authorwenzelm
Thu Feb 25 19:22:13 2016 +0100 (2016-02-25)
changeset 62416cb6c4e307b1c
parent 62415 62c03eb38e49
child 62417 d515293f5970
slightly more robust re-initialization;
lib/scripts/getfunctions
lib/scripts/getsettings
     1.1 --- a/lib/scripts/getfunctions	Thu Feb 25 19:08:48 2016 +0100
     1.2 +++ b/lib/scripts/getfunctions	Thu Feb 25 19:22:13 2016 +0100
     1.3 @@ -6,11 +6,7 @@
     1.4  # non-interactive bash processess. NB: bash shell functions are not portable
     1.5  # and may be dropped by aggressively POSIX-conformant versions of /bin/sh.
     1.6  
     1.7 -if [ -z "$ISABELLE_SETTINGS_PRESENT" ]
     1.8 -then
     1.9 -  echo 1>&2 "Missing Isabelle settings environment"
    1.10 -  exit 2
    1.11 -elif type splitarray >/dev/null 2>/dev/null
    1.12 +if type splitarray >/dev/null 2>/dev/null
    1.13  then
    1.14    :
    1.15  else
     2.1 --- a/lib/scripts/getsettings	Thu Feb 25 19:08:48 2016 +0100
     2.2 +++ b/lib/scripts/getsettings	Thu Feb 25 19:22:13 2016 +0100
     2.3 @@ -4,14 +4,17 @@
     2.4  #
     2.5  # Static Isabelle environment for root of process tree.
     2.6  
     2.7 +export ISABELLE_HOME
     2.8 +
     2.9 +export BASH_ENV="$ISABELLE_HOME/lib/scripts/getfunctions"
    2.10 +source "$BASH_ENV"
    2.11 +
    2.12 +
    2.13  if [ -z "$ISABELLE_SETTINGS_PRESENT" ]
    2.14  then
    2.15  
    2.16  export ISABELLE_SETTINGS_PRESENT=true
    2.17  
    2.18 -export BASH_ENV="$ISABELLE_HOME/lib/scripts/getfunctions"
    2.19 -source "$BASH_ENV"
    2.20 -
    2.21  set -o allexport
    2.22  
    2.23  #sane environment defaults (notably on Mac OS X)
    2.24 @@ -50,8 +53,6 @@
    2.25    unset CLASSPATH
    2.26  fi
    2.27  
    2.28 -export ISABELLE_HOME
    2.29 -
    2.30  #main executables
    2.31  ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
    2.32  ISABELLE_PROCESS="$ISABELLE_HOME/bin/isabelle_process"