Fix php.exe loading on Windows

NativePHP · Apr 30, 2024 · 0a2155d · 0a2155d
1 parent 161303e
commit 0a2155d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/resources/js/php.js b/resources/js/php.js
@@ -57,15 +57,16 @@ if (phpBinaryPath) {
                 zipfile.openReadStream(entry, function (err, readStream) {
                     if (err) throw err;
 
-                    const writeStream = fs.createWriteStream(join(binaryDestDir, 'php'));
+                    const binaryPath = join(binaryDestDir, phpBinaryFilename);
+                    const writeStream = fs.createWriteStream(binaryPath);
 
                     readStream.pipe(writeStream);
 
                     writeStream.on("close", function() {
-                        console.log('Copied PHP binary to ', binaryDestDir);
+                        console.log('Copied PHP binary to ', binaryPath);
 
                         // Add execute permissions
-                        fs.chmod(join(binaryDestDir, 'php'), 0o755, (err) => {
+                        fs.chmod(binaryPath, 0o755, (err) => {
                             if (err) {
                                 console.log(`Error setting permissions: ${err}`);
                             }

diff --git a/resources/js/src/main/index.js b/resources/js/src/main/index.js
@@ -1,10 +1,13 @@
 import {app} from 'electron'
 import NativePHP from '@nativephp/electron-plugin'
+import path from 'path'
 import defaultIcon from '../../resources/icon.png?asset&asarUnpack'
-// We can use `php` on all platforms because on Windows we copy the php.exe to `php` in electron-builder.js
-import phpBinary from '../../resources/php/php?asset&asarUnpack'
 import certificate from '../../resources/cacert.pem?asset&asarUnpack'
 
+const isWin = process.platform === 'win32';
+
+const phpBinary = path.join(__dirname, '../../resources', isWin ? 'php/php.exe' : 'php/php');
+
 /**
  * Turn on the lights for the NativePHP app.
  */