feat: Build snap packages for Linux

develar · develar · commit a7aa97953bf2 · 2016-12-24T11:54:58.000+01:00
Closes #509
diff --git a/src/targets/snap.ts b/src/targets/snap.ts
@@ -58,7 +58,7 @@ export default class SnapTarget extends Target {
       }
     }
 
-    await this.helper.computeDesktopEntry(this.options, "$snap.$app", path.join(snapDir, "setup", "gui", `${snap.name}.desktop`), {
+    await this.helper.computeDesktopEntry(this.options, `${snap.name}`, path.join(snapDir, "setup", "gui", `${snap.name}.desktop`), {
       "Icon": "${SNAP}/meta/gui/icon.png"
     })
 
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
@@ -208,8 +208,8 @@ async function checkLinuxResult(outDir: string, packager: Packager, checkOptions
       if (target === "appimage") {
         result.push(`${appInfo.name}-${appInfo.version}-${arch === Arch.x64 ? "x86_64" : Arch[arch]}.AppImage`)
       }
-      else if (target === "deb") {
-        result.push(`${appInfo.name}_${appInfo.version}_${arch === Arch.x64 ? "amd64" : Arch[arch]}.deb`)
+      else if (target === "deb" || target === "snap") {
+        result.push(`${appInfo.name}_${appInfo.version}_${arch === Arch.x64 ? "amd64" : Arch[arch]}.${target}`)
       }
       else {
         result.push(`TestApp-${appInfo.version}.${target}`)
diff --git a/test/src/linux/linuxPackagerTest.ts b/test/src/linux/linuxPackagerTest.ts
@@ -5,7 +5,17 @@ import { Platform } from "out"
 
 test.ifDevOrLinuxCi("AppImage", app({targets: Platform.LINUX.createTarget()}))
 
-// test.ifNotCi("snap", app({targets: Platform.LINUX.createTarget("snap")}))
+if (process.platform === "linux") {
+  test("snap", app({
+    targets: Platform.LINUX.createTarget("snap"),
+    config: {
+      productName: "Snap Electron Builder Test",
+    },
+    appMetadata: {
+      name: "snap-electron-builder-test",
+    },
+  }))
+}
 
 test.ifDevOrLinuxCi("AppImage - default icon, custom executable and custom desktop", app({
   targets: Platform.LINUX.createTarget("appimage"),
diff --git a/yarn.lock b/yarn.lock
@@ -67,8 +67,8 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.5.29.tgz#29f4dd9314fbccb080d8bd84b9c23811ec5090c2"
 
 "@types/node@*":
-  version "6.0.52"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.52.tgz#1ac3a99b42320f9e463482f25af4c2359473aaa6"
+  version "6.0.53"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.53.tgz#8c300ca8ba51f80f98f3525b932ff47c6efd6be1"
 
 "@types/source-map-support@^0.2.28":
   version "0.2.28"

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export default class SnapTarget extends Target {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		- await this.helper.computeDesktopEntry(this.options, "$snap.$app", path.join(snapDir, "setup", "gui", `${snap.name}.desktop`), {
	`61`	+ await this.helper.computeDesktopEntry(this.options, `${snap.name}`, path.join(snapDir, "setup", "gui", `${snap.name}.desktop`), {
`62`	`62`	`"Icon": "${SNAP}/meta/gui/icon.png"`
`63`	`63`	`})`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,8 @@ async function checkLinuxResult(outDir: string, packager: Packager, checkOptions`
`208`	`208`	`if (target === "appimage") {`
`209`	`209`	result.push(`${appInfo.name}-${appInfo.version}-${arch === Arch.x64 ? "x86_64" : Arch[arch]}.AppImage`)
`210`	`210`	`}`
`211`		`- else if (target === "deb") {`
`212`		- result.push(`${appInfo.name}_${appInfo.version}_${arch === Arch.x64 ? "amd64" : Arch[arch]}.deb`)
	`211`	`+ else if (target === "deb" \|\| target === "snap") {`
	`212`	+ result.push(`${appInfo.name}_${appInfo.version}_${arch === Arch.x64 ? "amd64" : Arch[arch]}.${target}`)
`213`	`213`	`}`
`214`	`214`	`else {`
`215`	`215`	result.push(`TestApp-${appInfo.version}.${target}`)