Skip to content

Commit 0c68ac9

Browse files
Brian HoffmanBrian Hoffman
authored andcommitted
Fix osx commands
1 parent 16750a6 commit 0c68ac9

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

make_openbazaar.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
##
1111

1212

13-
ELECTRONVER=0.37.8
13+
ELECTRONVER=1.4.4
1414
NODEJSVER=5.1.1
1515
PYTHONVER=2.7.11
1616
UPXVER=391
@@ -304,10 +304,12 @@ case $OS in win32*)
304304
echo 'Packaging Electron application...'
305305
cd temp-$OS
306306
../node_modules/.bin/electron-packager ../OpenBazaar-Client OpenBazaar --app-category-type=public.app-category.business --protocol-name=OpenBazaar --protocol=ob --platform=darwin --arch=x64 --icon=../osx/tent.icns --version=${ELECTRONVER} --overwrite --app-version=$PACKAGE_VERSION
307+
../node_modules/.bin/electron-packager ../OpenBazaar-Client OpenBazaarClient --app-category-type=public.app-category.business --protocol-name=OpenBazaar --protocol=ob --platform=darwin --arch=x64 --icon=../osx/tent.icns --version=${ELECTRONVER} --overwrite --app-version=$PACKAGE_VERSION
307308
cd ..
308309

309310
echo 'Moving .app to build directory...'
310311
mv temp-$OS/OpenBazaar-darwin-x64/* build-$OS/
312+
mv temp-$OS/OpenBazaarClient-darwin-x64/* build-$OS/
311313
rm -rf build-$OS/OpenBazaar-darwin-x64
312314

313315
echo 'Create OpenBazaar-Server folder inside the .app...'
@@ -323,11 +325,16 @@ case $OS in win32*)
323325
npm i electron-installer-dmg -g
324326
codesign --force --deep --sign "$SIGNING_IDENTITY" ./build-$OS/OpenBazaar.app
325327
electron-installer-dmg ./build-$OS/OpenBazaar.app OpenBazaar-$PACKAGE_VERSION --icon ./osx/tent.icns --out=./build-$OS --overwrite --background=./osx/finder_background.png --debug
328+
codesign --force --deep --sign "$SIGNING_IDENTITY" ./build-$OS/OpenBazaarClient.app
329+
electron-installer-dmg ./build-$OS/OpenBazaarClient.app OpenBazaarClient-$PACKAGE_VERSION --icon ./osx/tent.icns --out=./build-$OS --overwrite --background=./osx/finder_background.png --debug
330+
326331

327332
echo 'Codesign the DMG and zip'
328333
codesign --force --sign "$SIGNING_IDENTITY" ./build-$OS/OpenBazaar-$PACKAGE_VERSION.dmg
334+
codesign --force --sign "$SIGNING_IDENTITY" ./build-$OS/OpenBazaarClient-$PACKAGE_VERSION.dmg
329335
cd build-$OS
330336
zip -r OpenBazaar-mac-$PACKAGE_VERSION.zip OpenBazaar.app
337+
zip -r OpenBazaarClient-mac-$PACKAGE_VERSION.zip OpenBazaarClient.app
331338

332339
;;
333340

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openbazaar",
33
"productName": "OpenBazaar",
4-
"version": "1.1.8",
4+
"version": "1.1.9",
55
"description": "Decentralized Peer to Peer Marketplace for Bitcoin",
66
"main": "Gruntfile.js",
77
"scripts": {

0 commit comments

Comments
 (0)