kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change electron-packager from callback to promises (#1660)

Browse Source 
Change electron-packager from callback to promises
This commit is contained in:
Feross Aboukhadijeh
2019-09-05 21:47:44 -07:00
committed by GitHub
parent 9eecc2410c 59fa19d7ad
commit a1d4f706f7
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bin/package.js
View File

@@ -186,8 +186,7 @@ function buildDarwin (cb) {
const plist = require('plist') const plist = require('plist')
console.log('Mac: Packaging electron...') console.log('Mac: Packaging electron...')
electronPackager(Object.assign({}, all, darwin), function (err, buildPath) { electronPackager(Object.assign({}, all, darwin)).then(function (buildPath) {
if (err) return cb(err)
console.log('Mac: Packaged electron. ' + buildPath) console.log('Mac: Packaged electron. ' + buildPath)
const appPath = path.join(buildPath[0], config.APP_NAME + '.app') const appPath = path.join(buildPath[0], config.APP_NAME + '.app')
@@ -356,6 +355,8 @@ function buildDarwin (cb) {
cb(null) cb(null)
}) })
} }
}).catch(function (err) {
cb(err)
}) })
} }
@@ -376,8 +377,7 @@ function buildWin32 (cb) {
CERT_PATH = path.join(os.homedir(), 'Desktop') CERT_PATH = path.join(os.homedir(), 'Desktop')
} }
electronPackager(Object.assign({}, all, win32), function (err, buildPath) { electronPackager(Object.assign({}, all, win32)).then(function (buildPath) {
if (err) return cb(err)
console.log('Windows: Packaged electron. ' + buildPath) console.log('Windows: Packaged electron. ' + buildPath)
let signWithParams let signWithParams
@@ -406,7 +406,7 @@ function buildWin32 (cb) {
series(tasks, cb) series(tasks, cb)
function packageInstaller (filesPath, cb) { function packageInstaller (filesPath, cb) {
console.log(`Windows: Creating installer...`) console.log('Windows: Creating installer...')
installer.createWindowsInstaller({ installer.createWindowsInstaller({
appDirectory: filesPath, appDirectory: filesPath,
@@ -437,7 +437,7 @@ function buildWin32 (cb) {
version: pkg.version version: pkg.version
}) })
.then(function () { .then(function () {
console.log(`Windows: Created installer.`) console.log('Windows: Created installer.')
/** /**
* Delete extraneous Squirrel files (i.e. *.nupkg delta files for older * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
@@ -455,7 +455,7 @@ function buildWin32 (cb) {
} }
function packagePortable (filesPath, cb) { function packagePortable (filesPath, cb) {
console.log(`Windows: Creating portable app...`) console.log('Windows: Creating portable app...')
const portablePath = path.join(filesPath, 'Portable Settings') const portablePath = path.join(filesPath, 'Portable Settings')
mkdirp.sync(portablePath) mkdirp.sync(portablePath)
@@ -470,16 +470,18 @@ function buildWin32 (cb) {
const outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip') const outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
zip.zipSync(inPath, outPath) zip.zipSync(inPath, outPath)
console.log(`Windows: Created portable app.`) console.log('Windows: Created portable app.')
cb(null) cb(null)
} }
}).catch(function (err) {
cb(err)
}) })
} }
function buildLinux (cb) { function buildLinux (cb) {
console.log('Linux: Packaging electron...') console.log('Linux: Packaging electron...')
electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
if (err) return cb(err) electronPackager(Object.assign({}, all, linux)).then(function (buildPath) {
console.log('Linux: Packaged electron. ' + buildPath) console.log('Linux: Packaged electron. ' + buildPath)
const tasks = [] const tasks = []
@@ -492,11 +494,13 @@ function buildLinux (cb) {
} }
}) })
series(tasks, cb) series(tasks, cb)
}).catch(function (err) {
cb(err)
}) })
function packageDeb (filesPath, cb) { function packageDeb (filesPath, cb) {
// Create .deb file for Debian-based platforms // Create .deb file for Debian-based platforms
console.log(`Linux: Creating deb...`) console.log('Linux: Creating deb...')
const deb = require('nobin-debian-installer')() const deb = require('nobin-debian-installer')()
const destPath = path.join('/opt', pkg.name) const destPath = path.join('/opt', pkg.name)
@@ -524,20 +528,20 @@ function buildLinux (cb) {
cwd: path.join(config.STATIC_PATH, 'linux', 'share') cwd: path.join(config.STATIC_PATH, 'linux', 'share')
}], function (err) { }], function (err) {
if (err) return cb(err) if (err) return cb(err)
console.log(`Linux: Created deb.`) console.log('Linux: Created deb.')
cb(null) cb(null)
}) })
} }
function packageZip (filesPath, cb) { function packageZip (filesPath, cb) {
// Create .zip file for Linux // Create .zip file for Linux
console.log(`Linux: Creating zip...`) console.log('Linux: Creating zip...')
const inPath = path.join(DIST_PATH, path.basename(filesPath)) const inPath = path.join(DIST_PATH, path.basename(filesPath))
const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux.zip') const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux.zip')
zip.zipSync(inPath, outPath) zip.zipSync(inPath, outPath)
console.log(`Linux: Created zip.`) console.log('Linux: Created zip.')
cb(null) cb(null)
} }
} }