fixup

TNG · Nov 26, 2024 · d51d742 · d51d742
1 parent b269e43
commit d51d742
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/WebUI/build/scripts/install-full-python-env.js b/WebUI/build/scripts/install-full-python-env.js
@@ -63,7 +63,7 @@ function prepareTargetDir(targetDir) {
 
 
 function main() {
-    const targetDir = path.join(envDir, '..', '..', 'offline', ${platform}, 'env');
+    const targetDir = path.join(envDir, '..', '..', 'offline', platform, 'env');
     prepareTargetDir(targetDir)
     copyToTargetDir(envDir, targetDir)
 

diff --git a/WebUI/build/scripts/provide-electron-build-resources.js b/WebUI/build/scripts/provide-electron-build-resources.js
@@ -37,7 +37,7 @@ function symlinkBackendDir(backendDir, serviceLink) {
 function zipPythonEnv(sevenZipExe, pythonEnvDir, targetPath) {
     console.log(`zipping ${pythonEnvDir} to ${targetPath}`);
 
-    const zip = childProcess.spawnSync(sevenZipExe, ['a', targetPath, , "env"]);
+    const zip = childProcess.spawnSync(sevenZipExe, ['a', targetPath, pythonEnvDir]);
     console.log(zip.stdout.toString());
     console.error(zip.stderr.toString());
     if (zip.status !== 0) {
@@ -56,9 +56,18 @@ function copyResources(targetDir, ...files) {
     }
 }
 
+function clearPreviousZip(zipFilePath) {
+    if
+    (fs.existsSync(zipFilePath)) {
+        console.log('Removing previous zip file:', zipFilePath)<
+        fs.rmSync(zipFilePath, { recursive: true });
+    }
+}
+
 function main() {
     const sevenZipExe = path.join(buildResourcesDir, '7zr.exe');
 
+    clearPreviousZip(path.join(targetDir, `env.7z`));
     zipPythonEnv(sevenZipExe, pythenEnvDir, path.join(targetDir, `env.7z`));
 
     symlinkBackendDir(backendDir, path.join(targetDir, 'service'))

diff --git a/WebUI/package.json b/WebUI/package.json
@@ -8,7 +8,7 @@
 
     "fetch-build-resources": "cross-env node ./build/scripts/fetch-python-package-resources.js --target_dir=../build_resources",
 
-    "prepare-python-env": "cross-env node ./build/scripts/prepare-python-env.js --build_resources_dir=../build_resources --target_dir=../build-envs/slim/env",
+    "prepare-python-env": "cross-env node ./build/scripts/prepare-python-env.js --build_resources_dir=../build_resources --target_dir=../build-envs/online/env",
     "install-full-python-env": "cross-env node ./build/scripts/install-full-python-env.js --env_dir=../build-envs/online/env",
     "provide-electron-build-resources": "cross-env node build/scripts/provide-electron-build-resources.js --build_resources_dir=../build_resources --backend_dir=../service --target_dir=./external",