Fix

Author: NoryiE

.github/workflows/ci.yml

@@ -45,8 +45,12 @@ jobs:
       # luac only proves a file parses; this proves the engine comes up.
       - name: Smoke-test the source install
         run: |
-          mkdir -p "$RUNNER_TEMP/craftos-smoke"
-          cp tools/smoketest.lua "$RUNNER_TEMP/craftos-smoke/smoketest.lua"
+          # --directory is CraftOS-PC's *data* directory; the computer's own
+          # root lives in computer/0 below it. Files copied anywhere else are
+          # invisible to the shell.
+          root="$RUNNER_TEMP/craftos-smoke/computer/0"
+          mkdir -p "$root"
+          cp tools/smoketest.lua "$root/smoketest.lua"
           craftos \
             --headless \
             --directory "$RUNNER_TEMP/craftos-smoke" \
@@ -87,14 +91,15 @@ jobs:
       - name: Smoke-test release bundles
         run: |
           for variant in obsidian obsidian.min obsidian.compressed; do
-            workdir="$RUNNER_TEMP/craftos-bundle-$variant"
-            mkdir -p "$workdir"
-            cp tools/smoketest.lua "$workdir/smoketest.lua"
-            cp "$RUNNER_TEMP/obsidian-bundle/$variant.lua" "$workdir/obsidian.lua"
+            datadir="$RUNNER_TEMP/craftos-bundle-$variant"
+            root="$datadir/computer/0"
+            mkdir -p "$root"
+            cp tools/smoketest.lua "$root/smoketest.lua"
+            cp "$RUNNER_TEMP/obsidian-bundle/$variant.lua" "$root/obsidian.lua"
             echo "--- $variant.lua ---"
             craftos \
               --headless \
-              --directory "$workdir" \
+              --directory "$datadir" \
               --exec "local ok = shell.run('smoketest.lua'); os.shutdown(ok and 0 or 1)"
           done
 

.github/workflows/docs.yml

@@ -1,17 +1,8 @@
 name: Obsidian Docs & Deploy
 
+# Manual only. Publishing to Pages is never triggered by a push; run this
+# workflow from the Actions tab when the site should be updated.
 on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'src/**'
-      - 'guides/**'
-      - 'tools/docgen.lua'
-      - '.github/vitepress.config.mts'
-      - '.github/docs-index.md'
-      - '.github/docs-home.md'
-      - '.github/workflows/docs.yml'
   workflow_dispatch:
 
 permissions:

src/init.lua

@@ -19,19 +19,31 @@
 
 local args = { ... }
 
---- Obsidian's own directory. CraftOS' require calls a module chunk with
---- (name, path); running this file as a program is supported as a fallback.
+--- Obsidian's own directory.
+---
+--- Asking the chunk where it was loaded from is the only method that does not
+--- depend on how the caller invoked it: a module is compiled with the chunk
+--- name "@/path/to/init.lua". The (name, path) pair that CraftOS' require
+--- passes is kept as a fallback for hosts without debug.getinfo.
+---
+--- Deliberately no fallback to shell.getRunningProgram(): that yields the
+--- directory of the *calling* program, which would silently resolve modules
+--- against the wrong tree instead of failing.
 local function locate()
+    local getinfo = _G.debug and _G.debug.getinfo
+    if getinfo then
+        local info = getinfo(1, "S")
+        local source = info and info.source
+        if type(source) == "string" and source:sub(1, 1) == "@" then
+            return fs.getDir(source:sub(2))
+        end
+    end
+
     local path = args[2]
     if type(path) == "string" and path ~= "" then
         return fs.getDir(path)
     end
-    if shell and shell.getRunningProgram then
-        local running = shell.getRunningProgram()
-        if type(running) == "string" and running ~= "" then
-            return fs.getDir(running)
-        end
-    end
+
     error("Obsidian: cannot determine its own location. "
         .. 'Load it with require("obsidian").', 0)
 end