Skip to content

Commit 072f109

Browse files
committed
Updates for 64-bit Linux
1 parent 35f75a1 commit 072f109

File tree

4 files changed

+32
-11
lines changed

4 files changed

+32
-11
lines changed

Gruntfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ module.exports = function(grunt) {
88
productName: 'OpenBazaar',
99
name: 'openbazaar',
1010
arch: 'amd64',
11-
version: '1.0.4',
11+
version: '1.1.8',
1212
bin: 'openbazaar',
1313
maintainer: 'OpenBazaar <[email protected]>',
1414
rename: function (dest, src) {
15-
return dest + '<%= name %>_<%= version %>_<%= arch %>.deb';
15+
return dest + '<%= name %><%= clientonly %>_<%= version %>_<%= arch %>.deb';
1616
},
1717
productDescription: 'Decentralized Peer to Peer Marketplace for Bitcoin',
1818
lintianOverrides: [
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
3030
src: 'temp-linux64/openbazaar-linux-x64/',
3131
dest: 'build-linux64/',
3232
rename: function (dest) {
33-
return path.join(dest, '<%= name %>_<%= arch %>.deb')
33+
return path.join(dest, '<%= name %><%= clientonly %>_<%= arch %>.deb')
3434
}
3535
}
3636
},

linux/config_amd64.client.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"productName": "OpenBazaar",
3+
"name": "openbazaar-client",
4+
"bin": "openbazaar-client",
5+
"maintainer": "OpenBazaar <[email protected]>",
6+
"arch": "amd64",
7+
"src": "temp-linux64/openbazaar-linux-x64/",
8+
"dest": "build-linux64/",
9+
"productDescription": "Decentralized Peer to Peer Marketplace for Bitcoin",
10+
"intianOverrides": [
11+
"changelog-file-missing-in-native-package",
12+
"executable-not-elf-or-script",
13+
"extra-license-file"
14+
],
15+
"icon": "OpenBazaar-Client/imgs/openbazaar-icon.png",
16+
"categories": [
17+
"Utility"
18+
],
19+
"priority": "optional"
20+
}

linux/config_amd64.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"productName": "OpenBazaar",
33
"name": "openbazaar",
4-
"version": "1.0.4",
54
"bin": "openbazaar",
65
"maintainer": "OpenBazaar <[email protected]>",
76
"arch": "amd64",
@@ -18,4 +17,4 @@
1817
"Utility"
1918
],
2019
"priority": "optional"
21-
}
20+
}

make_openbazaar.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,22 +457,24 @@ case $OS in win32*)
457457
cp dist/openbazaard ../build-$OS/OpenBazaar-Server
458458
cp ob.cfg ../build-$OS/OpenBazaar-Server
459459

460-
echo "Packaging Electron application"
460+
echo "Packaging Electron application"
461461
cd ../temp-$OS
462462
../node_modules/.bin/electron-packager ../OpenBazaar-Client openbazaar --platform=linux --arch=all --version=${ELECTRONVER} --overwrite --prune
463-
464463
cd ..
465464

465+
# Copy server daemon and cfg into resources folder
466466
cp -rf build-$OS/OpenBazaar-Server temp-$OS/openbazaar-linux-x64/resources
467467

468-
sudo npm install -g [email protected]
469-
#npm install -g grunt-cli
470-
#npm install -g grunt-electron-installer --save-dev
471-
#npm install -g grunt-electron-installer-debian --save-dev
468+
sudo npm install -g [email protected]
472469
sudo npm install -g [email protected]
473470

474471
electron-installer-debian --config linux/config_amd64.json
475472

473+
# Client only install
474+
rm -rf build-$OS/OpenBazaar-Server temp-$OS/openbazaar-linux-x64/resources/OpenBazaar-Server
475+
electron-installer-debian --clientonly=Client --config linux/config_amd64.client.json
476+
477+
476478
echo "Build done in build-$OS"
477479

478480
esac

0 commit comments

Comments
 (0)