feat(AppImage): ElementaryOS and libappindicator1 support by default

develar · develar · commit 580eeaa433ad · 2017-02-21T22:47:01.000+01:00
Close #1082
diff --git a/docs/Options.md b/docs/Options.md
@@ -41,7 +41,6 @@ Most of the options accept `null` — for example, to explicitly set that DMG ic
   * [squirrelWindows](#SquirrelWindowsOptions)
   * [win Windows Specific Options](#WinBuildOptions)
   * [snap [Snap](http://snapcraft.io) Specific Options](#SnapOptions)
-  * [appImage [AppImage](http://appimage.org) Specific Options](#AppImageOptions)
   * [dmg.window DMG Windows Position and Size](#DmgWindow)
 * [Fields in the package.json](#Metadata)
 
@@ -264,12 +263,6 @@ To use Squirrel.Windows please install `electron-builder-squirrel-windows` depen
 | plugs | <a name="SnapOptions-plugs"></a><p>The list of [plugs](https://snapcraft.io/docs/reference/interfaces). Defaults to <code>[&quot;home&quot;, &quot;x11&quot;, &quot;unity7&quot;, &quot;browser-support&quot;, &quot;network&quot;, &quot;gsettings&quot;, &quot;pulseaudio&quot;, &quot;opengl&quot;]</code>.</p> <p>If list contains <code>default</code>, it will be replaced to default list, so, <code>[&quot;default&quot;, &quot;foo&quot;]</code> can be used to add custom plug <code>foo</code> in addition to defaults.</p>
 | ubuntuAppPlatformContent | <a name="SnapOptions-ubuntuAppPlatformContent"></a><p>Specify <code>ubuntu-app-platform1</code> to use [ubuntu-app-platform](https://insights.ubuntu.com/2016/11/17/how-to-create-snap-packages-on-qt-applications/). Snap size will be greatly reduced, but it is not recommended for now because “the snaps must be connected before running uitk-gallery for the first time”.</p>
 
-<a name="AppImageOptions"></a>
-### `appImage` [AppImage](http://appimage.org) Specific Options
-| Name | Description
-| --- | ---
-| includeRequiredLib | <a name="AppImageOptions-includeRequiredLib"></a>Whether to include required system libraries (`gconf2`, `libappindicator1`). Defaults to `false`.
-
 <a name="DmgWindow"></a>
 ### `dmg.window` DMG Windows Position and Size
 | Name | Description
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "7zip-bin": "^2.0.4",
     "archiver": "^1.3.0",
     "asar-electron-builder": "^0.13.5",
-    "aws-sdk": "^2.16.0",
+    "aws-sdk": "^2.17.0",
     "bluebird-lst": "^1.0.1",
     "chalk": "^1.1.3",
     "chromium-pickle-js": "^0.2.0",
diff --git a/packages/electron-builder/src/options/linuxOptions.ts b/packages/electron-builder/src/options/linuxOptions.ts
@@ -138,8 +138,4 @@ export interface SnapOptions extends LinuxBuildOptions {
  ### `appImage` [AppImage](http://appimage.org) Specific Options
  */
 export interface AppImageOptions extends LinuxBuildOptions {
-  /**
-  Whether to include required system libraries (`gconf2`, `libappindicator1`). Defaults to `false`.
-   */
-  readonly includeRequiredLib?: boolean | null
 }
diff --git a/packages/electron-builder/src/targets/LinuxTargetHelper.ts b/packages/electron-builder/src/targets/LinuxTargetHelper.ts
@@ -116,7 +116,8 @@ export class LinuxTargetHelper {
 
     const category = platformSpecificBuildOptions.category
     if (!isEmptyOrSpaces(category)) {
-      desktopMeta.Categories = category
+      if (category)
+      desktopMeta.Categories = category + (category.endsWith(";") ? "" : ";")
     }
 
     let data = `[Desktop Entry]`
diff --git a/packages/electron-builder/src/targets/appImage.ts b/packages/electron-builder/src/targets/appImage.ts
@@ -63,8 +63,8 @@ export default class AppImageTarget extends Target {
     }
     args.push("-map", this.helper.maxIconPath, "/.DirIcon")
 
-    if (this.options.includeRequiredLib === true && arch === Arch.x64) {
-      const libDir = await getBin("AppImage-packages", "16.01.17", "https://bintray.com/electron-userland/bin/download_file?file_path=AppImage-packages-16.01.17-x64.7z", "4a2da2d718bc1f5c6ca2f3a58e0655f39e23450b43e20424679dedf9b9b1ecae")
+    if (arch === Arch.x64) {
+      const libDir = await getBin("AppImage-packages", "21.02.17", "https://bintray.com/electron-userland/bin/download_file?file_path=AppImage-packages-21.02.17-x64.7z", "85af3bb0923235608910a5794a7a3ce0d6439614c0ebf9ba7545fd2087c3c152")
       args.push("-map", libDir, "/usr/lib")
     }
 
diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.0.2",
-    "aws-sdk": "^2.16.0",
+    "aws-sdk": "^2.17.0",
     "mime": "^1.3.4",
     "electron-publish": "~0.0.0-semantic-release",
     "electron-builder-util": "~0.0.0-semantic-release"
diff --git a/yarn.lock b/yarn.lock
@@ -236,9 +236,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-aws-sdk@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.16.0.tgz#c3bf4cac031b5af0db2a0f03e75f59a70ace8ff4"
+aws-sdk@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.17.0.tgz#b60351f37a77f04e5441fa900b0aea6df027aae3"
   dependencies:
     buffer "4.9.1"
     crypto-browserify "1.0.9"
@@ -982,10 +982,6 @@ diff@^3.0.0, diff@^3.0.1:
   version "0.4.0"
   resolved "https://github.com/develar/docdash.git#8b7ce8fe611abdc5885e56048cfcd94f3807da56"
 
-"docdash@https://github.com/develar/docdash/tarball/master":
-  version "0.4.0"
-  resolved "https://github.com/develar/docdash/tarball/master#637a3dab2715f5d70a21154cf0560a61b6e92d66"
-
 doctrine@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,4 @@ export interface SnapOptions extends LinuxBuildOptions {`
`138`	`138`	### `appImage` [AppImage](http://appimage.org) Specific Options
`139`	`139`	`*/`
`140`	`140`	`export interface AppImageOptions extends LinuxBuildOptions {`
`141`		`- /**`
`142`		- Whether to include required system libraries (`gconf2`, `libappindicator1`). Defaults to `false`.
`143`		`- */`
`144`		`- readonly includeRequiredLib?: boolean \| null`
`145`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ export class LinuxTargetHelper {`
`116`	`116`
`117`	`117`	`const category = platformSpecificBuildOptions.category`
`118`	`118`	`if (!isEmptyOrSpaces(category)) {`
`119`		`- desktopMeta.Categories = category`
	`119`	`+ if (category)`
	`120`	`+ desktopMeta.Categories = category + (category.endsWith(";") ? "" : ";")`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	let data = `[Desktop Entry]`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ export default class AppImageTarget extends Target {`
`63`	`63`	`}`
`64`	`64`	`args.push("-map", this.helper.maxIconPath, "/.DirIcon")`
`65`	`65`
`66`		`- if (this.options.includeRequiredLib === true && arch === Arch.x64) {`
`67`		`- const libDir = await getBin("AppImage-packages", "16.01.17", "https://bintray.com/electron-userland/bin/download_file?file_path=AppImage-packages-16.01.17-x64.7z", "4a2da2d718bc1f5c6ca2f3a58e0655f39e23450b43e20424679dedf9b9b1ecae")`
	`66`	`+ if (arch === Arch.x64) {`
	`67`	`+ const libDir = await getBin("AppImage-packages", "21.02.17", "https://bintray.com/electron-userland/bin/download_file?file_path=AppImage-packages-21.02.17-x64.7z", "85af3bb0923235608910a5794a7a3ce0d6439614c0ebf9ba7545fd2087c3c152")`
`68`	`68`	`args.push("-map", libDir, "/usr/lib")`
`69`	`69`	`}`
`70`	`70`