fixes andy-portmen/open-in#105

andy-portmen · Jan 12, 2025 · e9424d3 · e9424d3
1 parent 8b9fbbc
commit e9424d3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/host.js b/host.js
@@ -20,7 +20,7 @@ let files = [];
 const sprocess = [];
 
 const config = {
-  version: '0.9.5'
+  version: '0.9.7'
 };
 // closing node when parent process is killed
 process.stdin.resume();

diff --git a/install.sh b/install.sh
@@ -19,7 +19,11 @@ else
   echo "Installer is using the embedded NodeJS"
   echo
   if [[ $OSTYPE == 'darwin'* ]]; then
-    ../node/x64/node install.js --add_node $1
+    if [[ $MACHINE_TYPE == 'arm64' ]]; then
+      ../node/arm64/node install.js --add_node $1
+    else
+      ../node/x64/node install.js --add_node $1
+    fi
   elif [ ${MACHINE_TYPE} == 'x86_64' ]; then
     ../node/x64/node install.js --add_node $1
   else

diff --git a/linux/app/install.js b/linux/app/install.js
@@ -86,15 +86,19 @@ function application() {
         return reject(e);
       }
       const isNode = process.argv.filter(a => a === '--add_node').length === 0;
+
       const run = `#!/usr/bin/env bash\n${isNode ? process.argv[0] : './node'} $(dirname "$0")/host.js`;
       fs.writeFile(path.join(dir, 'run.sh'), run, e => {
         if (e) {
           return reject(e);
         }
         fs.chmodSync(path.join(dir, 'run.sh'), '0755');
         if (!isNode) {
-          fs.createReadStream(process.argv[0]).pipe(fs.createWriteStream(path.join(dir, 'node')));
-          fs.chmodSync(path.join(dir, 'node'), '0755');
+          const stream = fs.createReadStream(process.argv[0]);
+          stream.on('close', () => {
+            fs.chmodSync(path.join(dir, 'node'), '0755');
+          });
+          stream.pipe(fs.createWriteStream(path.join(dir, 'node')));
         }
         fs.createReadStream('host.js').pipe(fs.createWriteStream(path.join(dir, 'host.js')));
         fs.createReadStream('messaging.js').pipe(fs.createWriteStream(path.join(dir, 'messaging.js')));

diff --git a/mac/app/install.js b/mac/app/install.js
@@ -97,8 +97,11 @@ function application(callback) {
         }
         fs.chmodSync(path.join(dir, 'run.sh'), '0755');
         if (!isNode) {
-          fs.createReadStream(process.argv[0]).pipe(fs.createWriteStream(path.join(dir, 'node')));
-          fs.chmodSync(path.join(dir, 'node'), '0755');
+          const stream = fs.createReadStream(process.argv[0]);
+          stream.on('close', () => {
+            fs.chmodSync(path.join(dir, 'node'), '0755');
+          });
+          stream.pipe(fs.createWriteStream(path.join(dir, 'node')));
         }
         fs.createReadStream('host.js').pipe(fs.createWriteStream(path.join(dir, 'host.js')));
         fs.createReadStream('messaging.js').pipe(fs.createWriteStream(path.join(dir, 'messaging.js')));

diff --git a/mac/node/arm64/node b/mac/node/arm64/node