# HG changeset patch
# User wenzelm
# Date 1609876437 -3600
# Node ID 8d9fb810462b6419544682223c799605ec5a0f91
# Parent  a95f5ae5a12a3da95ca1ffdaccff169a22993d73
proper isabelle_home_prefix;
proper isabelle_options, with link;

diff -r a95f5ae5a12a -r 8d9fb810462b src/Pure/Admin/build_release.scala
--- a/src/Pure/Admin/build_release.scala	Tue Jan 05 20:29:57 2021 +0100
+++ b/src/Pure/Admin/build_release.scala	Tue Jan 05 20:53:57 2021 +0100
@@ -268,7 +268,7 @@
 
 # minimal Isabelle environment
 
-ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)""" + isabelle_home_prefix + """"; pwd)"
+ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)/""" + isabelle_home_prefix + """"; pwd)"
 source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
 
 #paranoia settings -- avoid intrusion of alien options
@@ -624,7 +624,7 @@
 
             make_isabelle_app(
               isabelle_target + Path.explode("lib/scripts/Isabelle_app"),
-              "/../..", jdk_component, classpath)
+              "../..", jdk_component, classpath)
 
             val linux_app = isabelle_target + Path.explode("contrib/linux_app")
             File.move(linux_app + Path.explode("Isabelle"),
@@ -657,19 +657,20 @@
             val app_resources = app_contents + Path.explode("Resources")
             File.move(tmp_dir + Path.explode(isabelle_name), app_resources)
 
-            val isabelle_home_prefix = "Contents/Resources/" + isabelle_name
+            val isabelle_home = Path.explode("Contents/Resources/" + isabelle_name)
+            val isabelle_options = Path.explode("Isabelle.options")
 
             File.link(
-              Path.explode(isabelle_home_prefix),
-              app_dir + Path.explode("Isabelle"),
-              force = true)
+              isabelle_home, app_dir + Path.explode("Isabelle"), force = true)
+            File.link(
+              isabelle_home + isabelle_options, app_dir + isabelle_options, force = true)
 
             make_isabelle_app(
               app_dir + Path.explode(isabelle_name),
-              isabelle_home_prefix, jdk_component, classpath)
+              isabelle_home.implode, jdk_component, classpath)
 
             make_isabelle_options(
-              app_dir + Path.explode("Isabelle.options"),
+              app_dir + isabelle_options,
               java_options ::: List("-Disabelle.app=true"))
 
             make_isabelle_plist(app_contents + Path.explode("Info.plist"), isabelle_name)