Linux build automated as best as possible

Metahari · Sep 21, 2017 · 85e3a0d · 85e3a0d
1 parent dfead12
commit 85e3a0d
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/build-script.js b/build-script.js
@@ -205,7 +205,9 @@ function goUpOneDirectory () {
 }
 
 function renameBuiltFolder () {
-    fs.renameSync('./win32/', './' + nwBuildSettings.appName);
+    // win32 => Koa11y
+    // linux64 => Koa11y
+    fs.renameSync('./' + platform, './' + nwBuildSettings.appName);
 }
 
 function zipApp () {
@@ -220,8 +222,12 @@ function zipApp () {
         buildInput = path.join(nwBuildSettings.appName + '.app');
         outputZip = path.join('OSX_' + filename);
     } else if (process.platform === 'linux') {
-        buildInput = path.join('linux64');
-        outputZip = path.join('LIN64_' + filename);
+        buildInput = path.join(nwBuildSettings.appName);
+        if (process.arch === 'x64') {
+            outputZip = path.join('LIN64_' + filename);
+        } else if (process.arch === 'ia32' || process.arch === 'x86') {
+            outputZip = path.join('LIN32_' + filename);
+        }
     }
 
     fs.removeSync(outputZip);
@@ -230,13 +236,7 @@ function zipApp () {
     // -tzip = create a zip formatted file
     // -mx=9 = use maximum compression
     // -y    = auto answer yes to all prompts
-    exec(zipExe + ' a -tzip -mx=9 -y "' + outputZip + '" "' + buildInput) + '"';
-    if (process.platform === 'linux') {
-        buildInput = path.join('linux32');
-        outputZip = path.join('LIN32_' + filename);
-        fs.removeSync(outputZip);
-        exec(zipExe + ' a -tzip -mx=9 -y ' + outputZip + ' ' + buildInput);
-    }
+    exec(zipExe + ' a -tzip -mx=9 -y "' + outputZip + '" "' + buildInput + '"');
 }
 
 function totalBuildTime () {
@@ -277,6 +277,10 @@ nw.build().then(function () {
             console.log(' ∙ Updated ' + nwBuildSettings.appName + '.exe');
         }
 
+        if (process.platform === 'darwin') {
+            return;
+        }
+
         copyManifest();
         console.log(' ∙ Copied package.json');
 
@@ -298,11 +302,6 @@ nw.build().then(function () {
         goUpOneDirectory();
         console.log(' ∙ Went up one directory');
 
-        if (platform !== 'win32') {
-            // This is as far as we've gotten on implementing the build for non-windows
-            return;
-        }
-
         renameBuiltFolder();
         console.log(' ∙ Renamed built folder');