fix 32 bit build

liudonghua123 · Dec 29, 2018 · 6d61862 · 6d61862
1 parent 3fcc5d6
commit 6d61862
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -5,10 +5,10 @@ This is Windows 98, running in an [Electron](https://electronjs.org/) app. Yes,
 Interested in Electron? Join as at [CovalenceConf](http://covalenceconf.com) in San Francisco! 
 
 ## Downloads
-|  | Windows | macOS | Linux |
-|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Standalone Download | 📦[Standalone, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-ia32-1.3.0.zip) <br /> 📦[Standalone, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-x64-1.3.0.zip)  |  | 📦[Standalone, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-linux-ia32-1.3.0.zip) <br /> 📦[Standalone, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-linux-x64-1.3.0.zip)  |
-| Installer | 💽[Setup, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-1.3.0-setup-x64.exe) |  |  💽[deb, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98_1.3.0_amd64.deb) <br /> 💽[deb, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98_1.3.0_i386.deb) <br /> 💽[rpm, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-1.3.0.x86_64.rpm) <br /> 💽[rpm, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-1.3.0.i386.rpm) |
+|                     | Windows                                                                                                                                                                                                                                                      | macOS | Linux                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Standalone Download | 📦[Standalone, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-ia32-1.3.0.zip) <br /> 📦[Standalone, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-x64-1.3.0.zip)  |       | 📦[Standalone, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-linux-ia32-1.3.0.zip) <br /> 📦[Standalone, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-linux-x64-1.3.0.zip)                                                                                                                                                                                                                     |
+| Installer           | 💽[Setup, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-1.3.0-setup-ia32.exe) <br />💽[Setup, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-win32-1.3.0-setup-x64.exe) |       | 💽[deb, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98_1.3.0_amd64.deb) <br /> 💽[deb, 32-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98_1.3.0_i386.deb) <br /> 💽[rpm, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-1.3.0.x86_64.rpm) <br /> 💽[rpm, 64-bit](https://github.com/liudonghua123/windows98/releases/download/v1.3.0/windows98-1.3.0.i386.rpm) |
 
 ![Screenshot](https://user-images.githubusercontent.com/1426799/44532591-4ceb3680-a6a8-11e8-8c2c-bc29f3bfdef7.png)
 

diff --git a/forge.config.js b/forge.config.js
@@ -21,16 +21,18 @@ module.exports = {
     {
       name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
-      config: {
-        name: 'windows98',
-        authors: 'Donghua Liu',
-        exe: 'windows98.exe',
-        noMsi: true,
-        remoteReleases: '',
-        setupExe: `windows98-win32-${package.version}-setup-${process.arch}.exe`,
-        setupIcon: path.resolve(__dirname, 'assets', 'icon.ico'),
-        certificateFile: process.env.WINDOWS_CERTIFICATE_FILE,
-        certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD
+      config: (arch) => {
+        return {
+          name: 'windows98',
+          authors: 'Donghua Liu',
+          exe: 'windows98.exe',
+          noMsi: true,
+          remoteReleases: '',
+          setupExe: `windows98-win32-${package.version}-setup-${arch}.exe`,
+          setupIcon: path.resolve(__dirname, 'assets', 'icon.ico'),
+          certificateFile: process.env.WINDOWS_CERTIFICATE_FILE,
+          certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD
+        }
       }
     },
     {