feat: support for Apple M1

xcodebuild · Jul 12, 2021 · 40f8eb0 · 40f8eb0
1 parent 487c30a
commit 40f8eb0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,3 +34,4 @@ jobs:
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          args: --universal
diff --git a/package.json b/package.json
@@ -21,10 +21,9 @@
     "update:node_modules": "npx rimraf vendor/files/node/modules && cd vendor/files/node && echo {} > package.json && yarn add --ignore-engines ../../whistle-start ../../whistle whistle.vase ../../whistle.scriptfile ../../whistle.chii-internal --production=true && mv node_modules modules && cd ../../.. && npm run update:zip",
     "update:zip": "cd vendor && rimraf files.zip && bestzip files.zip files/",
     "update:zip-fullnode": "cd vendor && rimraf files.zip && bestzip files.zip files/",
-    "update:node": "node scripts/update-node.js",
     "cleanbuild": "rm -rf node_modules && yarn install --ignore-engines && yarn run dist",
     "build-doc": "cd docs && yarn install --ignore-engines&& yarn run build",
-    "install-deps": "yarn install --ignore-engines && yarn run update:node && yarn run update:node_modules",
+    "install-deps": "yarn install --ignore-engines && yarn run update:node_modules",
     "ci": "npm install -g yarn && yarn run install-deps && yarn run dist",
     "postinstall": "electron-builder install-app-deps",
     "test": "echo 'no test here yet'",

diff --git a/scripts/update-node.js b/scripts/update-node.js
diff --git a/src/main/api.ts b/src/main/api.ts
@@ -12,6 +12,7 @@ import path from 'path';
 import { IPROXY_FILES_DIR, SYSTEM_IS_MACOS } from './const';
 import { app, nativeTheme, BrowserWindow } from 'electron';
 import http from 'http';
+import * as process from "process";
 
 interface SwpanModuleProp {
     moduleId: string;
@@ -54,7 +55,7 @@ cp.spawn = function(cmd, argv, options) {
 require(decodeURIComponent('${modulePath}'));`;
     const startProcess = () => {
         const child = spwan(
-            nodeExe,
+            process.execPath,
             [
                 '-e',
                 `const code = decodeURIComponent("${encodeURIComponent(nodeScript)}");console.log(code);eval(code);`,