diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml index 89dffe27537..6231757de33 100644 --- a/.idea/dictionaries/develar.xml +++ b/.idea/dictionaries/develar.xml @@ -60,6 +60,7 @@ emoji enoent eperm + ffmpeg finishpage flattennpmmodules fontconfig @@ -110,6 +111,7 @@ libappindicator libasound libdbusmenu + libevent libexec libgconf libgcrypt @@ -117,6 +119,7 @@ libnotify libnss libunity + libvpx libxss libxtst licensepage diff --git a/packages/electron-builder/src/targets/fpm.ts b/packages/electron-builder/src/targets/fpm.ts index 9d3ec2402c3..164dc121669 100644 --- a/packages/electron-builder/src/targets/fpm.ts +++ b/packages/electron-builder/src/targets/fpm.ts @@ -17,11 +17,11 @@ const fpmPath = (process.platform === "win32" || process.env.USE_SYSTEM_FPM === // can be called in parallel, all calls for the same version will get the same promise - will be downloaded only once function downloadFpm(): Promise { - const version = process.platform === "darwin" ? "fpm-1.6.3-20150715-2.2.2" : "fpm-1.6.3-2.3.1" + const version = process.platform === "darwin" ? "fpm-1.8.1-20150715-2.2.2" : "fpm-1.8.1-2.3.1" const osAndArch = process.platform === "darwin" ? "mac" : `linux-x86${process.arch === "ia32" ? "" : "_64"}` //noinspection SpellCheckingInspection - const sha2 = process.platform === "darwin" ? "1b13080ecfd2b6fddb984ed6e1dfcb38cdf5b051a04d609c2a95227ed9a5ecbc" : - (process.arch === "ia32" ? "b55f25749a27097140171f073466c52e59f733a275fea99e2334c540627ffc62" : "4c6fc529e996f7ff850da2d0bb6c85080e43be672494b14c0c6bdcc03bf57328") + const sha2 = process.platform === "darwin" ? "97352e184a1f54e5ed0d12f38ac383edebbe421db5a3fb59898e8c9a1c407ed7" : + (process.arch === "ia32" ? "8380331f7d9762a36d7c7181501c3fc9342745b8499b962f6ea37c7dc3778f99" : "6538fcd2486c2831949562abfd0017b67eff502addad5b444baec4899b0babc6") return getBin("fpm", version, `https://dl.bintray.com/electron-userland/bin/${version}-${osAndArch}.7z`, sha2) .then(it => path.join(it, "fpm")) diff --git a/packages/npm-publish.sh b/packages/npm-publish.sh index dd25152737b..4df11aa7417 100755 --- a/packages/npm-publish.sh +++ b/packages/npm-publish.sh @@ -3,4 +3,16 @@ set -e ln -f README.md packages/electron-builder/README.md -node packages/process.js \ No newline at end of file +npm publish packages/electron-builder-http || true +npm publish packages/electron-builder-core || true +npm publish packages/electron-builder-util || true +npm publish packages/electron-publish || true +npm publish packages/electron-publisher-s3 || true +npm publish packages/electron-builder || true +npm publish packages/electron-builder-squirrel-windows || true +npm publish packages/electron-updater || true + +npm publish packages/electron-forge-maker-appimage || true +npm publish packages/electron-forge-maker-snap || true +npm publish packages/electron-forge-maker-nsis || true +npm publish packages/electron-forge-maker-nsis-web || true \ No newline at end of file diff --git a/packages/publish.js b/packages/publish.js deleted file mode 100644 index 94ac478fa2b..00000000000 --- a/packages/publish.js +++ /dev/null @@ -1,17 +0,0 @@ -"use strict" - -const path = require("path") -const exec = require(path.join(__dirname, "electron-builder-util", "out", "util")).exec - -async function main() { - for (const projectDir of require("./process").getPackages()) { - await exec("npm", ["publish"]) - .catch(e => console.log(`Cannot publish ${projectDir}: ${e.message}`)) - } -} - -main() - .catch(error => { - console.error((error.stack || error).toString()) - process.exit(-1) - }) \ No newline at end of file