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

Linux build: Fix incorrect log output (#381)

Browse Source 
Now we use a function closure to capture the `destArch` variable so the
for loop can't change it.
This commit is contained in:
Feross Aboukhadijeh
2016-04-10 21:22:34 -07:00
parent e75cd45ec0
commit 33663bef3e
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
bin/package.js
View File

@@ -291,51 +291,59 @@ function buildWin32 (cb) {
}
function buildLinux (packageType, cb) {
var distPath = path.join(config.ROOT_PATH, 'dist')
electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
if (err) return cb(err)
var distPath = path.join(config.ROOT_PATH, 'dist')
for (var i = 0; i < buildPath.length; i++) {
var filesPath = buildPath[i]
var destArch = filesPath.split('-').pop()
if (packageType === 'deb' || packageType === 'all') {
// Create .deb file for debian based platforms
var deb = require('nobin-debian-installer')()
var destPath = path.join('/opt', pkg.name)
deb.pack({
package: pkg,
info: {
arch: destArch === 'x64' ? 'amd64' : 'i386',
targetDir: distPath,
depends: 'libc6 (>= 2.4)',
scripts: {
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
}
}
}, [{
src: ['./**'],
dest: destPath,
expand: true,
cwd: filesPath
}], function (err, done) {
if (err) return console.error(err.message || err)
console.log('Created Linux ' + destArch + ' .deb file.')
})
packageDeb(filesPath, destArch)
}
if (packageType === 'zip' || packageType === 'all') {
// Create .zip file for Linux
var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '-linux-' + destArch + '.zip')
var appFolderName = path.basename(filesPath)
cp.execSync(`cd ${distPath} && zip -r -y ${zipPath} ${appFolderName}`)
console.log('Created Linux ' + destArch + ' .zip file.')
packageZip(filesPath, destArch)
}
}
})
function packageDeb (filesPath, destArch) {
// Create .deb file for debian based platforms
var deb = require('nobin-debian-installer')()
var destPath = path.join('/opt', pkg.name)
deb.pack({
package: pkg,
info: {
arch: destArch === 'x64' ? 'amd64' : 'i386',
targetDir: distPath,
depends: 'libc6 (>= 2.4)',
scripts: {
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
}
}
}, [{
src: ['./**'],
dest: destPath,
expand: true,
cwd: filesPath
}], function (err) {
if (err) return console.error(err.message || err)
console.log('Created Linux ' + destArch + ' .deb file.')
})
}
function packageZip (filesPath, destArch) {
// Create .zip file for Linux
var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '-linux-' + destArch + '.zip')
var appFolderName = path.basename(filesPath)
cp.execSync(`cd ${distPath} && zip -r -y ${zipPath} ${appFolderName}`)
console.log('Created Linux ' + destArch + ' .zip file.')
}
}
function printDone (err, buildPath) {