Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace nobin-debian-installer #1682

Merged
merged 4 commits into from
Sep 10, 2019
Merged

Replace nobin-debian-installer #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aff402f
Replace nobin-debian-installer
hicom150 Sep 9, 2019
6255ccd
Resolve requested changes
hicom150 Sep 10, 2019
4000535
Merge branch 'master' into replace_nobin_debian_installer
hicom150 Sep 10, 2019
b34417b
add back removed log statement
feross Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 23 additions & 29 deletions bin/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,35 +501,29 @@ function buildLinux (cb) {
// Create .deb file for Debian-based platforms
console.log('Linux: Creating deb...')

const deb = require('nobin-debian-installer')()
const destPath = path.join('/opt', pkg.name)

deb.pack({
package: pkg,
info: {
arch: 'amd64',
targetDir: DIST_PATH,
depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
scripts: {
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
}
}
}, [{
src: ['./**'],
dest: destPath,
expand: true,
cwd: filesPath
}, {
src: ['./**'],
dest: path.join('/usr', 'share'),
expand: true,
cwd: path.join(config.STATIC_PATH, 'linux', 'share')
}], function (err) {
if (err) return cb(err)
console.log('Linux: Created deb.')
cb(null)
})
const installer = require('electron-installer-debian')

const options = {
src: filesPath + '/',
dest: DIST_PATH,
arch: 'amd64',
bin: 'WebTorrent',
icon: {
'48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
'256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
},
categories: ['Network', 'FileTransfer', 'P2P'],
mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
}

installer(options).then(
() => {
console.log('Linux: Created deb.')
cb(null)
},
(err) => cb(err)
)
}

function packageZip (filesPath, cb) {
Expand Down
Loading