From 264892933943117f28417c00409efe949f626fcf Mon Sep 17 00:00:00 2001 From: Kendal Cormany Date: Thu, 24 Oct 2024 12:48:21 -0700 Subject: [PATCH] see if these adjustments work --- scripts/signPython.sh | 13 ++++++++----- scripts/todesktop/beforeInstall.js | 12 +++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/scripts/signPython.sh b/scripts/signPython.sh index b2f60e46..6648d549 100644 --- a/scripts/signPython.sh +++ b/scripts/signPython.sh @@ -1,11 +1,14 @@ python -m pip install --upgrade pip +wait pip install comfy-cli -cd ../ -pwd +wait +cd .. +echo $(dirname $0) cd assets comfy --skip-prompt --here install --fast-deps --m-series --manager-url https://github.com/Comfy-Org/manager-core +wait cd ComfyUI -cd ../ +cd .. comfy --here standalone --platform macos comfy standalone --rehydrate rmdir ComfyUI/custom_nodes/ComfyUI-Manager/.git @@ -17,9 +20,9 @@ cd python2/python/ filelist=("lib/libpython3.12.dylib" "lib/python3.12/lib-dynload/_crypt.cpython-312-darwin.so" "bin/uv" "bin/uvx" "bin/python3.12") for file in ${filelist[@]}; do codesign --sign 6698D856280DC1662A8E01E5B63428CB6D6651BB --force --timestamp --options runtime --entitlements ../../../scripts/entitlements.mac.plist "$file"; done echo Rezip -cd ../../ +cd ../.. mv python python3 mv python2/python python tar -czf python.tgz python/ -cd ../ +cd .. rmdir ./.git \ No newline at end of file diff --git a/scripts/todesktop/beforeInstall.js b/scripts/todesktop/beforeInstall.js index 68c424d0..a9574354 100644 --- a/scripts/todesktop/beforeInstall.js +++ b/scripts/todesktop/beforeInstall.js @@ -25,21 +25,23 @@ module.exports = async ({ pkgJsonPath, pkgJson, appDir, hookName }) => { if (os.platform() === "win32") { console.log("win ver"); - const result1 = execSync(`python --version`,execOutput); + const result1 = execSync(`python --version`,execOutput).toString(); console.log(result1); - const result2 = execSync(`python -3.1 -m pip install comfy-cli`, execOutput); + const result4 = execSync(`python -m pip install --upgrade pip`).toString(); + console.log(result4); + const result2 = execSync(`python -m pip install comfy-cli`, execOutput).toString(); console.log(result2); console.log("finish pip"); - const result3 = execSync(`yarn run make:assets:nvidia`, execOutput); + const result3 = execSync(`yarn run make:assets:nvidia`, execOutput).toString(); console.log(result3); console.log("finish yarn run"); } if (os.platform() === "darwin") { console.log("mac ver"); - const result1 = execSync(`ls`, execOutput); + const result1 = execSync(`ls`, execOutput).toString(); console.log(result1); - const result = execSync(`sh ${path.join(dirPath, 'scripts', 'signPython.sh')}`, execOutput); + const result = execSync(`sh ${path.join(dirPath, 'scripts', 'signPython.sh')}`, execOutput).toString(); console.log("finish python"); } }; \ No newline at end of file