Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

fix(packaging): accept the spec's PersonalJarvis launcher name

rubenluetke10-beep81e587c85182
diff --git a/packaging/linux/build.sh b/packaging/linux/build.sh
index 5610dea3a6..387e7d100c 100755
--- a/packaging/linux/build.sh
+++ b/packaging/linux/build.sh
@@ -130,17 +130,24 @@ else
)
fi
+# The windowed target is named PersonalJarvis in jarvis.spec, because `Jarvis`
+# and `jarvis` are the SAME path on Windows and on a default macOS volume and
+# the second executable would overwrite the first. Linux has no such problem,
+# but the freeze is shared, so accept either name rather than pinning one.
+GUI_EXE_CANDIDATES=("PersonalJarvis" "Jarvis")
+GUI_EXE_NAME=""
if building; then
- [ -x "${FREEZE_DIR}/Jarvis" ] \
- || die "PyInstaller did not produce '${FREEZE_DIR}/Jarvis' (the GUI launcher target in jarvis.spec)"
- if [ ! -e "${FREEZE_DIR}/jarvis" ]; then
- # The contract asks for two executables sharing one COLLECT. On Linux they
- # are the same program (PyInstaller's console flag has no meaning here), so
- # a link keeps the AppImage correct while the spec catches up - but say so
- # loudly, because on Windows and macOS the missing target is a real gap.
- log "WARNING: '${FREEZE_DIR}/jarvis' is missing - jarvis.spec has no second, console CLI EXE target. Linking it to the GUI executable so the CLI entry exists."
- run ln -s Jarvis "${FREEZE_DIR}/jarvis"
- fi
+ for candidate in "${GUI_EXE_CANDIDATES[@]}"; do
+ if [ -x "${FREEZE_DIR}/${candidate}" ]; then
+ GUI_EXE_NAME="${candidate}"
+ break
+ fi
+ done
+ [ -n "${GUI_EXE_NAME}" ] \
+ || die "PyInstaller produced none of ${GUI_EXE_CANDIDATES[*]} in '${FREEZE_DIR}' - jarvis.spec has no windowed EXE target"
+ log "windowed executable: ${GUI_EXE_NAME}"
+else
+ GUI_EXE_NAME="PersonalJarvis"
fi
# --- 3. AppDir --------------------------------------------------------------
@@ -157,8 +164,24 @@ if building; then
# the executable" layout keeps working without a wrapper. cp -a preserves the
# executable bits and the symlinks inside the freeze.
cp -a "${FREEZE_DIR}/." "${APPDIR}/usr/bin/"
+
+ # AppRun and the .desktop entry address the launcher as usr/bin/Jarvis, which
+ # is the name the release contract uses. A symlink keeps that stable whatever
+ # jarvis.spec calls the binary; PyInstaller resolves its _internal directory
+ # through /proc/self/exe, which follows the link into the same directory.
+ if [ ! -e "${APPDIR}/usr/bin/Jarvis" ]; then
+ ln -s "${GUI_EXE_NAME}" "${APPDIR}/usr/bin/Jarvis"
+ fi
+ if [ ! -e "${APPDIR}/usr/bin/jarvis" ]; then
+ # On Linux both targets are the same program - PyInstaller's console flag
+ # has no meaning here - so a link keeps the CLI entry the contract asks for
+ # even when the spec ships only one executable. Say it loudly: on Windows
+ # and macOS a missing console target is a real gap, not a cosmetic one.
+ log "WARNING: the freeze has no 'jarvis' executable - jarvis.spec has no console CLI EXE target. Linking it to ${GUI_EXE_NAME} so the CLI entry exists."
+ ln -s "${GUI_EXE_NAME}" "${APPDIR}/usr/bin/jarvis"
+ fi
else
- log "[dry-run] would copy ${FREEZE_DIR}/. into ${APPDIR}/usr/bin/"
+ log "[dry-run] would copy ${FREEZE_DIR}/. into ${APPDIR}/usr/bin/ and link Jarvis/jarvis to ${GUI_EXE_NAME}"
fi
run "${PYTHON}" "${SCRIPT_DIR}/make_desktop_entry.py" \
diff --git a/packaging/macos/build.sh b/packaging/macos/build.sh
index 02a645ecd7..f973272f33 100755
--- a/packaging/macos/build.sh
+++ b/packaging/macos/build.sh
@@ -138,6 +138,17 @@ if building; then
[ -d "${APP_BUNDLE}" ] || die "PyInstaller did not produce '${APP_BUNDLE}'. jarvis.spec must contain a darwin BUNDLE(...) block that names the app '${APP_NAME}'."
[ -x "${APP_BUNDLE}/Contents/MacOS/jarvis" ] \
|| die "'${APP_BUNDLE}/Contents/MacOS/jarvis' is missing. The bundle must ship the console CLI entry so 'jarvis serve' works from a native install."
+ # CFBundleExecutable must exist or the app cannot launch at all, and Finder
+ # reports it as damaged rather than naming the missing file.
+ BUNDLE_EXECUTABLE="$(
+ /usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' \
+ "${APP_BUNDLE}/Contents/Info.plist" 2>/dev/null || true
+ )"
+ [ -n "${BUNDLE_EXECUTABLE}" ] \
+ || die "'${APP_BUNDLE}/Contents/Info.plist' has no CFBundleExecutable"
+ [ -x "${APP_BUNDLE}/Contents/MacOS/${BUNDLE_EXECUTABLE}" ] \
+ || die "Info.plist names '${BUNDLE_EXECUTABLE}' as CFBundleExecutable, but Contents/MacOS/${BUNDLE_EXECUTABLE} does not exist"
+ log "bundle executable: ${BUNDLE_EXECUTABLE}"
fi
log "app bundle: ${APP_BUNDLE}"