Merge branch 'master' of https://github.com/tomcl/issie

tomcl · Mar 25, 2024 · 8d6e72d · 8d6e72d
2 parents cbf6f18 + 900fe7f
commit 8d6e72d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Renderer/Interface/FilesIO.fs b/src/Renderer/Interface/FilesIO.fs
@@ -42,11 +42,11 @@ let staticDir() =
     /// on MacOs we think it should be ../Resources/static
     /// we hope staticDir will give this?
     let isMac = Node.Api.``process``.platform = Node.Base.Darwin
-    if productionBuild  && not isMac then
-        "./resources/static"
-    elif productionBuild && isMac then
-        "./Resources/static"
-    else
+    if productionBuild && not isMac then
+        "./resources/static"
+    elif productionBuild && isMac then
+        path.join [|__dirname; ".."; ".."; "static"|]
+    else
         staticDirFromStatic()
 
 /// absolute path to repo directory ./static

diff --git a/src/Renderer/UI/TopMenuView.fs b/src/Renderer/UI/TopMenuView.fs
@@ -351,11 +351,14 @@ let private openProject model dispatch =
 /// load demo project into Issie executables
 let loadDemoProject model dispatch basename =
     warnAppWidth dispatch (fun _ ->
-        let newDir = "./demos/" + basename
+        let isMac = Node.Api.``process``.platform = Node.Base.Darwin
+        let homeDir = if isMac then pathJoin [|FilesIO.staticDir(); ".."; ".."|] else "."
+
+        let newDir = homeDir + "/demos/" + basename
         let sourceDir = FilesIO.staticDir() + "/demos/" + basename
         printf "%s" $"loading demo {sourceDir} into {newDir}"
 
-        ensureDirectory "./demos/"
+        ensureDirectory (homeDir + "/demos/")
         ensureDirectory newDir
 
         readFilesFromDirectory newDir