File tree Expand file tree Collapse file tree 2 files changed +36
-4
lines changed
Expand file tree Collapse file tree 2 files changed +36
-4
lines changed Original file line number Diff line number Diff line change @@ -19,18 +19,34 @@ if [[ ! -f "${DMG_PATH}" ]]; then
1919 exit 1
2020fi
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+
2237if [[ -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)" ) "
2441elif command -v 7zz > /dev/null 2>&1 ; then
2542 SEVEN_Z_BIN=" $( command -v 7zz) "
2643elif 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)" ) "
3045else
3146 echo " No 7z binary found. Install 7zip or run npm install first." >&2
3247 exit 1
3348fi
49+ SEVEN_Z_BIN=" $( prepare_7z_bin " ${SEVEN_Z_BIN} " ) "
3450
3551rm -rf " ${WORK_DIR} "
3652mkdir -p " ${WORK_DIR} "
Original file line number Diff line number Diff line change @@ -13,18 +13,34 @@ if [[ ! -f "${DMG_PATH}" ]]; then
1313 exit 1
1414fi
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+
1631if [[ -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)" ) "
1835elif command -v 7zz > /dev/null 2>&1 ; then
1936 SEVEN_Z_BIN=" $( command -v 7zz) "
2037elif 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)" ) "
2439else
2540 echo " No 7z binary found. Install 7zip or place tools/7zz." >&2
2641 exit 1
2742fi
43+ SEVEN_Z_BIN=" $( prepare_7z_bin " ${SEVEN_Z_BIN} " ) "
2844
2945rm -rf " ${WORK_DIR} " " ${APP_ASAR_DIR} " " ${APP_RESOURCES_DIR} "
3046mkdir -p " ${WORK_DIR} " " ${APP_ASAR_DIR} " " ${APP_RESOURCES_DIR} /bin"
You can’t perform that action at this time.
0 commit comments