Skip to content

Commit

Permalink
fix(snap): do not add "adapter: none" for prepacked snap electron-use…
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Feb 22, 2018
1 parent 333a45d commit 866ae11
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
"dependencies": {
"7zip-bin": "~3.1.0",
"app-builder-bin": "1.3.7",
"app-builder-bin": "1.3.8",
"archiver": "^2.1.1",
"async-exit-hook": "^2.0.1",
"aws-sdk": "^2.199.0",
"aws-sdk": "^2.201.0",
"bluebird-lst": "^1.0.5",
"chalk": "^2.3.0",
"chromium-pickle-js": "^0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"out"
],
"dependencies": {
"app-builder-bin": "1.3.7",
"app-builder-bin": "1.3.8",
"temp-file": "^3.1.1",
"fs-extra-p": "^4.5.2",
"is-ci": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"7zip-bin": "~3.1.0",
"app-builder-bin": "1.3.7",
"app-builder-bin": "1.3.8",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.5",
"chromium-pickle-js": "^0.2.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/electron-builder-lib/src/targets/snap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export default class SnapTarget extends Target {
apps: {
[snapName]: {
command: `bin/desktop-launch $SNAP/app/${this.packager.executableName}`,
adapter: "none",
environment: {
TMPDIR: "$XDG_RUNTIME_DIR",
PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH",
Expand All @@ -79,6 +78,10 @@ export default class SnapTarget extends Target {
},
}

if (!this.isUseTemplateApp) {
snap[snapName].adapter = "none"
}

if (buildPackages.length > 0) {
snap.parts.app["build-packages"] = buildPackages
}
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-publisher-s3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"dependencies": {
"fs-extra-p": "^4.5.2",
"aws-sdk": "^2.199.0",
"aws-sdk": "^2.201.0",
"mime": "^2.2.0",
"electron-publish": "~0.0.0-semantic-release",
"builder-util": "^0.0.0-semantic-release",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -275,25 +275,25 @@ anymatch@^1.3.0:
micromatch "^2.1.5"
normalize-path "^2.0.0"

[email protected].7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.7.tgz#9eeb28f7f2c9eb91f4dcd02f03e9117b45891cae"
[email protected].8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.8.tgz#138eaddce970fb485b715e8c3cd88064aee4efb4"

[email protected].7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.7.tgz#43705d9f0c75ef8ac2a07dcf9c31d9c0d3e27770"
[email protected].8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.8.tgz#ca7fa326ffeea0eb70cbdce1715ebb27b2ebb7a2"

[email protected].7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.7.tgz#f5ddef00b0822885fd376f4323aa48c14a5788bf"
[email protected].8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.8.tgz#5f48cbe5ca9b200a11b7f786c7de486b53543df9"

[email protected].7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.7.tgz#4df1bc9b9448935caaa2f45283655b0704ab994f"
[email protected].8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.8.tgz#f0f2f41d5fa30aad7b2543d7263d2139c8a918ec"
optionalDependencies:
app-builder-bin-linux "1.3.7"
app-builder-bin-mac "1.3.7"
app-builder-bin-win "1.3.7"
app-builder-bin-linux "1.3.8"
app-builder-bin-mac "1.3.8"
app-builder-bin-win "1.3.8"

append-transform@^0.4.0:
version "0.4.0"
Expand Down Expand Up @@ -484,9 +484,9 @@ atob@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"

aws-sdk@^2.199.0:
version "2.199.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.199.0.tgz#94c2484b030f299dda494c94bacc4f66e4b32de9"
aws-sdk@^2.201.0:
version "2.201.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.201.0.tgz#7a4528262d9097abe37ebf4e6bf9d1851db47003"
dependencies:
buffer "4.9.1"
events "^1.1.1"
Expand Down

0 comments on commit 866ae11

Please sign in to comment.