From 03e43d1830bcc50c0c7bd6f6ee6c26543e8233be Mon Sep 17 00:00:00 2001 From: develar Date: Tue, 27 Dec 2016 08:20:44 +0100 Subject: [PATCH] fix(appimage): USE_SYSTEM_XORRISO env to force usage of system xorriso --- docker/wine/Dockerfile | 10 ++-------- docs/Options.md | 2 +- nsis-auto-updater/README.md | 2 +- src/targets/appImage.ts | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile index 6967f5c7796..857681e1d24 100644 --- a/docker/wine/Dockerfile +++ b/docker/wine/Dockerfile @@ -1,13 +1,7 @@ FROM electronuserland/electron-builder:latest -# libgnome-keyring-dev — to build keytar -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F9CB8DB0 && \ -echo "deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu xenial main " | tee /etc/apt/sources.list.d/wine.list && \ -dpkg --add-architecture i386 && \ -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ -echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \ -apt-get update -y && \ -apt-get install -y --no-install-recommends wine1.8 mono-devel ca-certificates-mono && \ +RUN apt-get update -y && \ +apt-get install -y --no-install-recommends wine-stable mono-devel ca-certificates-mono && \ apt-get clean && rm -rf /var/lib/apt/lists/* ENV WINEDEBUG -all,err+all diff --git a/docs/Options.md b/docs/Options.md index d0b2da91bde..2d325a1656d 100644 --- a/docs/Options.md +++ b/docs/Options.md @@ -282,7 +282,7 @@ Amazon S3 — `https` must be used, so, if you use direct Amazon S3 endpoints, f | summary | The 78 character long summary. Defaults to [productName](#AppMetadata-productName). | grade |

The quality grade of the snap. It can be either devel (i.e. a development version of the snap, so not to be published to the “stable” or “candidate” channels) or “stable” (i.e. a stable release or release candidate, which can be released to all channels). Defaults to stable.

| assumes | The list of features that must be supported by the core in order for this snap to install. -| stagePackages |

The list of Ubuntu packages to use that are needed to support the app part creation. Like depends for deb. Defaults to ["libnotify4", "libappindicator1", "libxtst6", "libnss3", "fontconfig-config"].

+| stagePackages |

The list of Ubuntu packages to use that are needed to support the app part creation. Like depends for deb. Defaults to ["libnotify4", "libappindicator1", "libxtst6", "libnss3", "libxss1", "fontconfig-config", "gconf2", "libasound2"].

| ubuntuAppPlatformContent |

Specify ubuntu-app-platform1 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”.

diff --git a/nsis-auto-updater/README.md b/nsis-auto-updater/README.md index d7f9fcf93a0..573a208b193 100644 --- a/nsis-auto-updater/README.md +++ b/nsis-auto-updater/README.md @@ -1 +1 @@ -See wiki soon. \ No newline at end of file +[Auto Update](https://github.com/electron-userland/electron-builder/wiki/Auto-Update). \ No newline at end of file diff --git a/src/targets/appImage.ts b/src/targets/appImage.ts index cc502539458..3744d4e5193 100644 --- a/src/targets/appImage.ts +++ b/src/targets/appImage.ts @@ -71,7 +71,7 @@ export default class AppImageTarget extends Target { return } - await exec(process.arch === "x64" ? path.join(appImagePath, "xorriso") : "xorriso", args) + await exec(process.arch !== "x64" || (process.env.USE_SYSTEM_XORRISO === "true" || process.env.USE_SYSTEM_XORRISO === "") ? "xorriso" : path.join(appImagePath, "xorriso"), args) await new BluebirdPromise((resolve, reject) => { const rd = createReadStream(path.join(appImagePath, arch === Arch.ia32 ? "32" : "64", "runtime"))