Ship the Bare ELF in the release and stop baking host paths into the service.
Rolling release / release (push) Failing after 6m40s
Rolling release / release (push) Failing after 6m40s
The rolling bundle already contains the runtime binary. The installer now starts that file through a relative launcher, and the checkout unit is no longer packed for other users. Co-authored-by: Cursor <[email protected]>
This commit is contained in:
@@ -114,14 +114,13 @@ case "$(uname -m)" in
|
||||
aarch64|arm64) BARE_BIN="${APP_DIR}/node_modules/bare-runtime-linux-arm64/bin/bare" ;;
|
||||
*) BARE_BIN="" ;;
|
||||
esac
|
||||
if [[ ! -x "${BARE_BIN}" ]]; then BARE_BIN="$(command -v bare || true)"; fi
|
||||
if [[ -z "${BARE_BIN}" || ! -x "${BARE_BIN}" ]]; then
|
||||
log "error: no Bare runtime for $(uname -m) in the installed bundle"
|
||||
echo "The installed bundle does not contain a Bare runtime for $(uname -m). Install the official rolling bundle or build it with npm run package:bare." >&2
|
||||
echo "The installed bundle does not contain a Bare runtime for $(uname -m). Install the official rolling bundle. A Bare binary from PATH is not used." >&2
|
||||
exit 1
|
||||
fi
|
||||
chmod 755 "${BARE_BIN}"
|
||||
log "using Bare runtime ${BARE_BIN}"
|
||||
chmod 755 "${BARE_BIN}" "${ROOT_DIR}/packaging/jarvisd-launch.sh"
|
||||
log "using bundled Bare runtime ${BARE_BIN}"
|
||||
NODE_BIN="$(command -v node || true)"
|
||||
if [[ -z "${NODE_BIN}" || ! -x "${NODE_BIN}" ]]; then
|
||||
NODE_BIN="$(bash -lc 'command -v node' 2>/dev/null || true)"
|
||||
@@ -193,7 +192,7 @@ activate_extension() {
|
||||
log "GNOME extension ${EXT_UUID} is installed but not active in this session; log out and back in, or run: gnome-extensions enable ${EXT_UUID}"
|
||||
fi
|
||||
}
|
||||
sed -e "s#__JARVIS_BARE__#${BARE_BIN}#" -e "s#__JARVIS_NODE__#${NODE_BIN}#" "${ROOT_DIR}/packaging/jarvisd.service" > "${HOME}/.config/systemd/user/jarvisd.service"
|
||||
sed -e "s#__JARVIS_NODE__#${NODE_BIN}#" "${ROOT_DIR}/packaging/jarvisd.service" > "${HOME}/.config/systemd/user/jarvisd.service"
|
||||
log "wrote ${HOME}/.config/systemd/user/jarvisd.service"
|
||||
DBUS_DIR="${XDG_DATA_HOME:-${HOME}/.local/share}/dbus-1/services"
|
||||
mkdir -p "${DBUS_DIR}"
|
||||
|
||||
Reference in New Issue
Block a user