Skip to content

Commit 3385bbe

Browse files
committed
build: stage bundled 7zip binary outside workspace mount
1 parent 28fbea3 commit 3385bbe

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

scripts/get-codex-version.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,34 @@ if [[ ! -f "${DMG_PATH}" ]]; then
1919
exit 1
2020
fi
2121

22+
prepare_7z_bin() {
23+
local src="$1"
24+
local staged_dir staged_bin
25+
26+
if [[ "${src}" == "${ROOT_DIR}"/* ]]; then
27+
staged_dir="$(mktemp -d)"
28+
staged_bin="${staged_dir}/$(basename "${src}")"
29+
cp -f "${src}" "${staged_bin}"
30+
chmod +x "${staged_bin}"
31+
echo "${staged_bin}"
32+
else
33+
echo "${src}"
34+
fi
35+
}
36+
2237
if [[ -x "${ROOT_DIR}/tools/7zz" ]]; then
2338
SEVEN_Z_BIN="${ROOT_DIR}/tools/7zz"
39+
elif [[ -d "${ROOT_DIR}/node_modules" ]]; then
40+
SEVEN_Z_BIN="$(node -e "console.log(require('7zip-bin').path7za)")"
2441
elif command -v 7zz >/dev/null 2>&1; then
2542
SEVEN_Z_BIN="$(command -v 7zz)"
2643
elif command -v 7z >/dev/null 2>&1; then
2744
SEVEN_Z_BIN="$(command -v 7z)"
28-
elif [[ -d "${ROOT_DIR}/node_modules" ]]; then
29-
SEVEN_Z_BIN="$(node -e "console.log(require('7zip-bin').path7za)")"
3045
else
3146
echo "No 7z binary found. Install 7zip or run npm install first." >&2
3247
exit 1
3348
fi
49+
SEVEN_Z_BIN="$(prepare_7z_bin "${SEVEN_Z_BIN}")"
3450

3551
rm -rf "${WORK_DIR}"
3652
mkdir -p "${WORK_DIR}"

scripts/internal/extract-dmg.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,34 @@ if [[ ! -f "${DMG_PATH}" ]]; then
1313
exit 1
1414
fi
1515

16+
prepare_7z_bin() {
17+
local src="$1"
18+
local staged_dir staged_bin
19+
20+
if [[ "${src}" == "${ROOT_DIR}"/* ]]; then
21+
staged_dir="$(mktemp -d)"
22+
staged_bin="${staged_dir}/$(basename "${src}")"
23+
cp -f "${src}" "${staged_bin}"
24+
chmod +x "${staged_bin}"
25+
echo "${staged_bin}"
26+
else
27+
echo "${src}"
28+
fi
29+
}
30+
1631
if [[ -x "${ROOT_DIR}/tools/7zz" ]]; then
1732
SEVEN_Z_BIN="${ROOT_DIR}/tools/7zz"
33+
elif [[ -d "${ROOT_DIR}/node_modules" ]]; then
34+
SEVEN_Z_BIN="$(node -e "console.log(require('7zip-bin').path7za)")"
1835
elif command -v 7zz >/dev/null 2>&1; then
1936
SEVEN_Z_BIN="$(command -v 7zz)"
2037
elif command -v 7z >/dev/null 2>&1; then
2138
SEVEN_Z_BIN="$(command -v 7z)"
22-
elif [[ -d "${ROOT_DIR}/node_modules" ]]; then
23-
SEVEN_Z_BIN="$(node -e "console.log(require('7zip-bin').path7za)")"
2439
else
2540
echo "No 7z binary found. Install 7zip or place tools/7zz." >&2
2641
exit 1
2742
fi
43+
SEVEN_Z_BIN="$(prepare_7z_bin "${SEVEN_Z_BIN}")"
2844

2945
rm -rf "${WORK_DIR}" "${APP_ASAR_DIR}" "${APP_RESOURCES_DIR}"
3046
mkdir -p "${WORK_DIR}" "${APP_ASAR_DIR}" "${APP_RESOURCES_DIR}/bin"

0 commit comments

Comments
 (0)