fix(snap): electron-builder uses mksquashfs options that are incompat…

…ible with snap store Close #2803
electron-userland · Apr 18, 2018 · e828245 · e828245
1 parent 2a707cc
commit e828245
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/docker/9/Dockerfile b/docker/9/Dockerfile
@@ -1,6 +1,6 @@
 FROM electronuserland/builder:base
 
-ENV NODE_VERSION 9.8.0
+ENV NODE_VERSION 9.11.1
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN apt-get -qq update && \

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "////": "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.8.4",
+    "app-builder-bin": "1.8.5",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.224.1",

diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "1.8.4",
+    "app-builder-bin": "1.8.5",
     "temp-file": "^3.1.1",
     "fs-extra-p": "^4.5.2",
     "is-ci": "^1.1.0",

diff --git a/packages/electron-builder-lib/package.json b/packages/electron-builder-lib/package.json
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.8.4",
+    "app-builder-bin": "1.8.5",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",

diff --git a/packages/electron-builder-lib/src/targets/snap.ts b/packages/electron-builder-lib/src/targets/snap.ts
@@ -108,6 +108,7 @@ export default class SnapTarget extends Target {
     }
 
     if (!this.isUseTemplateApp && snap.parts.app.after.includes(desktopPart)) {
+      // todo change install to override-build when new snapcraft release will be installed on most user machines
       const desktopPartOverride: any = {
         install: `set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share

diff --git a/scripts/snap-template.sh b/scripts/snap-template.sh
@@ -4,7 +4,7 @@ rm -rf ~/squashfs-root
 #unsquashfs /media/psf/test/electron-builder-test/dist/se-electron2_1.1.0_amd64.snap
 unsquashfs /media/psf/test/electron-builder-test/dist/se-wo-template_1.1.0_amd64.snap
 rm -rf ~/squashfs-root/app ~/squashfs-root/snap ~/squashfs-root/meta ~/squashfs-root/command.sh
-#mksquashfs ~/squashfs-root /media/psf/test/electron-template-2.snap -b 1048576 -comp xz -Xdict-size 100% -noappend -comp xz -no-xattrs -no-fragments -all-root
-mksquashfs ~/squashfs-root /media/psf/test/electron-template-1.snap -b 1048576 -comp xz -Xdict-size 100% -noappend -comp xz -no-xattrs -no-fragments -all-root
+#mksquashfs ~/squashfs-root /media/psf/test/electron-template-2.snap -comp xz -noappend -comp xz -no-xattrs -no-fragments -all-root
+mksquashfs ~/squashfs-root /media/psf/test/electron-template-1.snap -comp xz -noappend -comp xz -no-xattrs -no-fragments -all-root
 
 shasum -a 512 /Volumes/test/electron-template-2.snap | xxd -r -p | base64
diff --git a/test/src/linux/snapTest.ts b/test/src/linux/snapTest.ts
@@ -34,7 +34,6 @@ test.ifAll.ifDevOrLinuxCi("snap electron 2", app({
   },
 }))
 
-// custom packages to test not-prepacked snap build
 // very slow
 test.skip("snap full", app({
   targets: snapTarget,

diff --git a/yarn.lock b/yarn.lock
@@ -411,25 +411,25 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-[email protected].4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.4.tgz#9fa4f4f6af21f147cdedc69279940134c77d297f"
+[email protected].5:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.5.tgz#bf001d3ef347e1179680a1760fea83d0832fc344"
 
-[email protected].4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.4.tgz#abd35353167b037a15353fe44c84b0b17045d12f"
+[email protected].5:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.5.tgz#31282504d232081a9de94d377736bf904bbfbd53"
 
-[email protected].4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.4.tgz#ba5f7a7d8ae48d32c400691b3c45f6f746c27748"
+[email protected].5:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.5.tgz#d7eefc1dff6052e137a3c5d68cd6e68ba862054b"
 
-[email protected].4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.4.tgz#ca8fd02209c2e0681de97fdb4c559d93381cc812"
+[email protected].5:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.5.tgz#ac0c0fad3c348ff3bde367e49b25cf5edc414407"
   optionalDependencies:
-    app-builder-bin-linux "1.8.4"
-    app-builder-bin-mac "1.8.4"
-    app-builder-bin-win "1.8.4"
+    app-builder-bin-linux "1.8.5"
+    app-builder-bin-mac "1.8.5"
+    app-builder-bin-win "1.8.5"
 
 append-transform@^0.4.0:
   version "0.4.0"