Merge pull request #231 from develar/229

fix: Github publishing not working on Linux #229
electron-userland · Mar 11, 2016 · 72bd5e9 · 72bd5e9
2 parents 2aea1cd + 841f397
commit 72bd5e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/docs/multi-platform-build.md b/docs/multi-platform-build.md
@@ -24,10 +24,16 @@ brew install Caskroom/cask/xquartz wine mono
 
 To build app in distributable format for Linux on OS X:
 ```
-brew install ruby gnu-tar libicns
+brew install ruby gnu-tar libicns imagemagick graphicsmagick
 gem install fpm
 ```
 
-Please note — Windows codesign supported currently only on Windows.
+## Linux
+To build app in distributable format for Linux:
+```
+sudo apt-get install icnsutils graphicsmagick
+```
+
+## Windows
 
-Linux and Windows: not documented yet.
+Not documented yet.
diff --git a/src/linuxPackager.ts b/src/linuxPackager.ts
@@ -121,8 +121,7 @@ Icon=${this.metadata.name}
   private async buildDeb(options: DebOptions, outDir: string, appOutDir: string, arch: string): Promise<string> {
     const archName = arch === "ia32" ? "i386" : "amd64"
     const target = "deb"
-    const outFilename = `${this.metadata.name}-${this.metadata.version}-${archName}.${target}`
-    const destination = path.join(outDir, outFilename)
+    const destination = path.join(outDir, `${this.metadata.name}-${this.metadata.version}-${archName}.${target}`)
     const scripts = await this.scriptFiles
     await exec("fpm", [
       "-s", "dir",
@@ -140,7 +139,7 @@ Icon=${this.metadata.name}
       "--deb-compression", options.compression || "xz",
       appOutDir + "/=/opt/" + this.appName,
     ].concat(await this.packageFiles))
-    return outFilename
+    return destination
   }
 }
 

diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
@@ -68,6 +68,7 @@ async function packAndCheck(projectDir: string, platforms: string[], packagerOpt
 
   const artifacts: Map<Platform, Array<string>> = new Map()
   packager.artifactCreated((file, platform) => {
+    assertThat(path.isAbsolute(file)).true()
     let list = artifacts.get(platform)
     if (list == null) {
       list = []