feat(AppImage): support armv7l arch

Close #1478
electron-userland · Jan 6, 2018 · fd2a1f0 · fd2a1f0 · simone · Jan 6, 2018
1 parent 1586f7f
commit fd2a1f0
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/packages/electron-builder-lib/src/targets/AppImageTarget.ts b/packages/electron-builder-lib/src/targets/AppImageTarget.ts
@@ -94,7 +94,7 @@ export default class AppImageTarget extends Target {
     // default gzip compression - 51.9, xz - 50.4 difference is negligible, start time - well, it seems, a little bit longer (but on Parallels VM on external SSD disk)
     // so, to be decided later, is it worth to use xz by default
     const args = [
-      "--runtime-file", path.join(vendorDir, `runtime-${(arch === Arch.ia32 ? "i686" : (arch === Arch.x64 ? "x86_64" : "armv7l"))}`),
+      "--runtime-file", path.join(vendorDir, `runtime-${(archToRuntimeName(arch))}`),
       "--no-appstream",
     ]
     if (debug.enabled) {
@@ -171,4 +171,20 @@ function copyDirUsingHardLinks(source: string, destination: string) {
     .then(() => exec("pax", ["-rwl", "-p", "amp" /* Do not preserve file access times, Do not preserve file modification times, Preserve the file mode	bits */, ".", destination], {
       cwd: source,
     }))
+}
+
+function archToRuntimeName(arch: Arch) {
+  switch (arch) {
+    case Arch.armv7l:
+      return "armv7"
+
+    case Arch.ia32:
+      return "i686"
+
+    case Arch.x64:
+      return "x86_64"
+
+    default:
+      throw new Error(`AppImage for arch ${Arch[arch]} not supported`)
+  }
 }
diff --git a/packages/electron-builder-lib/src/targets/tools.ts b/packages/electron-builder-lib/src/targets/tools.ts
@@ -12,7 +12,7 @@ export function getLinuxToolsPath() {
 
 export function getAppImage() {
   //noinspection SpellCheckingInspection
-  return getBinFromGithub("appimage", "9.0.3", "jaOGGGXLKjJV4SXajFOoIb7vCq4GbN0ggy5eosd8F0GAh0ythYfZSq9Lj/+uymmw2h3kKf9W8Y2KBnWxIjU0aw==")
+  return getBinFromGithub("appimage", "9.0.4", "pTFOnybYI2iGAyDUgXjzTkfuQ/E2ux8uLI1lXGB0RDoKhvFEq3y+q0sFzMOsbPTKZCcBRGhTujRlnsnTwgJmyw==")
 }
 
 export const fpmPath = new Lazy(() => {

diff --git a/test/out/linux/__snapshots__/linuxPackagerTest.js.snap b/test/out/linux/__snapshots__/linuxPackagerTest.js.snap
@@ -79,6 +79,22 @@ Object {
 }
 `;
 
+exports[`AppImage arm 1`] = `
+Object {
+  "linux": Array [
+    Object {
+      "arch": "armv7l",
+      "file": "TestApp-1.1.0-armv7l.AppImage",
+      "updateInfo": Object {
+        "blockMapSize": "@blockMapSize",
+        "sha512": "@sha512",
+        "size": "@size",
+      },
+    },
+  ],
+}
+`;
+
 exports[`AppImage ia32 1`] = `
 Object {
   "linux": Array [

diff --git a/test/src/linux/linuxPackagerTest.ts b/test/src/linux/linuxPackagerTest.ts
@@ -25,6 +25,13 @@ test.ifAll.ifNotWindows.ifNotCiMac("AppImage ia32", app({
   },
 }))
 
+test.ifAll.ifNotWindows.ifNotCiMac("AppImage arm", app({
+  targets: Platform.LINUX.createTarget("Appimage", Arch.armv7l),
+  config: {
+    publish: null,
+  },
+}))
+
 test.ifNotWindows.ifNotCiMac.ifAll("AppImage - doNotAsk system integration", app({
   targets: Platform.LINUX.createTarget(),
   config: {