diff --git a/lib/scripts/getsettings b/lib/scripts/getsettings --- a/lib/scripts/getsettings +++ b/lib/scripts/getsettings @@ -1,136 +1,136 @@ # -*- shell-script -*- :mode=shellscript: # # Author: Makarius # # 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 set -o allexport #sane environment defaults (notably on macOS) if [ "$ISABELLE_APP" = true -a -x /usr/libexec/path_helper ]; then eval $(/usr/libexec/path_helper -s) fi #Cygwin vs. POSIX if [ "$OSTYPE" = cygwin ] then unset INI_DIR if [ -n "$TEMP_WINDOWS" ]; then TMPDIR="$(cygpath -u "$TEMP_WINDOWS")" TMP="$TMPDIR" TEMP="$TMPDIR" fi if [ -z "$USER_HOME" ]; then USER_HOME="$(cygpath -u "$USERPROFILE")" fi CYGWIN_ROOT="$(platform_path "/")" ISABELLE_ROOT="$(platform_path "$ISABELLE_HOME")" ISABELLE_CLASSPATH="$(cygpath -i -u -p "$CLASSPATH")" unset CLASSPATH else if [ -z "$USER_HOME" ]; then USER_HOME="$HOME" fi ISABELLE_ROOT="$ISABELLE_HOME" ISABELLE_CLASSPATH="$CLASSPATH" unset CLASSPATH fi #init cumulative settings ISABELLE_FONTS="" ISABELLE_FONTS_HIDDEN="" ISABELLE_SCALA_SERVICES="" ISABELLE_DIRECTORIES="" #main executables ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle" ISABELLE_SCALA_SCRIPT="$ISABELLE_HOME/bin/isabelle_scala_script" PATH="$ISABELLE_HOME/bin:$PATH" #platform source "$ISABELLE_HOME/lib/scripts/isabelle-platform" if [ -z "$ISABELLE_PLATFORM_FAMILY" ]; then echo 1>&2 "Failed to determine hardware and operating system type!" exit 2 fi if [ -z "$ISABELLE_IDENTIFIER" -a -f "$ISABELLE_HOME/etc/ISABELLE_IDENTIFIER" ] then ISABELLE_IDENTIFIER="$(cat "$ISABELLE_HOME/etc/ISABELLE_IDENTIFIER")" fi ISABELLE_NAME="${ISABELLE_IDENTIFIER:-Isabelle}" # components ISABELLE_COMPONENTS="" ISABELLE_COMPONENTS_MISSING="" #main components init_component "$ISABELLE_HOME" [ -d "$ISABELLE_HOME/Admin" ] && init_component "$ISABELLE_HOME/Admin" if [ -d "$ISABELLE_HOME_USER" ]; then init_component "$ISABELLE_HOME_USER" else mkdir -p "$ISABELLE_HOME_USER" chmod $(umask -S) "$ISABELLE_HOME_USER" fi #POLYML_EXE if [ "$ISABELLE_PLATFORM_FAMILY" = "windows" ]; then POLYML_EXE="$ML_HOME/poly.exe" else POLYML_EXE="$ML_HOME/poly" fi #ML system identifier if [ -z "$ML_PLATFORM" ]; then ML_IDENTIFIER="$ML_SYSTEM" else ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" fi #enforce ISABELLE_OCAMLFIND if [ -d "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin" ]; then ISABELLE_OCAMLFIND="$ISABELLE_HOME/lib/scripts/ocamlfind" fi #enforce ISABELLE_GHC if [ -f "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY" ]; then if [ -f "$(cat "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY")" ]; then ISABELLE_GHC="$ISABELLE_HOME/lib/scripts/ghc" ISABELLE_GHC_STACK=true fi fi #enforce JAVA_HOME if [ -d "$ISABELLE_JDK_HOME/jre" ] then export JAVA_HOME="$ISABELLE_JDK_HOME/jre" else export JAVA_HOME="$ISABELLE_JDK_HOME" fi -ISABELLE_SETUP_CLASSPATH="$(isabelle_java java -classpath "$(platform_path "$ISABELLE_SETUP_JAR")" isabelle.setup.Setup classpath)" +ISABELLE_SETUP_CLASSPATH="$(isabelle_java java -jar "$(platform_path "$ISABELLE_SETUP_JAR")" classpath)" set +o allexport fi