openbazaar: some launcher cleanups and icons fixes

5 files changed, 90 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f95604279923..c31c00a8aec7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov  2 18:28:28 UTC 2017
+# Sat Nov  4 04:03:06 UTC 2017
 pkgbase = openbazaar
 	pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon
 	pkgver = 2.0.17
-	pkgrel = 1
+	pkgrel = 2
 	url = http://openbazaar.org
 	install = openbazaar.install
 	arch = i686
@@ -14,11 +14,13 @@ pkgbase = openbazaar
 	depends = electron
 	options = !strip
 	source = https://github.com/OpenBazaar/openbazaar-desktop/archive/v2.0.17.tar.gz
-	source = openbazaar.sh
+	source = openbazaar.js
 	source = openbazaar.desktop
+	source = icons.patch
 	md5sums = 3bea757fb365f59794a751598bfb2024
-	md5sums = a4eb003ad61dc2536ff5a3241b3aa19e
+	md5sums = 122a3e23d7ecfef0a82e756cb97c3e98
 	md5sums = f48876b52eee00c24abb7bbbb53d8e6c
+	md5sums = 90f70698f1593b1dda1349b1353451fd
 
 pkgname = openbazaar
 
diff --git a/PKGBUILD b/PKGBUILD
index d2b36c2d8705..ac4b68305e79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,48 @@
 
 pkgname=openbazaar
 pkgver=2.0.17
-pkgrel=1
-pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon" 
+pkgrel=2
+pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon"
 arch=(i686 x86_64)
 url="http://openbazaar.org"
 license=('MIT')
 depends=(electron)
 makedepends=(npm asar)
 source=("https://github.com/OpenBazaar/openbazaar-desktop/archive/v$pkgver.tar.gz"
-		"$pkgname.sh"
-		"$pkgname.desktop"
+	"$pkgname.js"
+	"$pkgname.desktop"
+	icons.patch
 )
 install=$pkgname.install
 options=('!strip')
 
 build(){
-  cd $srcdir/$pkgname-desktop-$pkgver
-  npm install 
-  npm run build
-  rm -rf {.eslint*,.travis*}
-  cp -rf prod/* js/
-  npm prune --production
-  asar pack ../$pkgname-desktop-$pkgver ../$pkgname.asar
+	cd $srcdir/$pkgname-desktop-$pkgver
+	patch -Np1 -i ../icons.patch
+	npm install
+	npm run build
+	rm -rf {.eslint*,.travis*}
+	cp -rf prod/* js/
+	npm prune --production
 }
 
 package(){
-  cd $srcdir
+	cd $srcdir
+	appdir=/usr/lib/
 
-msg2 "Installing Openbazaar data"
-  install -Dm644 $pkgname.asar $pkgdir/opt/$pkgname.asar
+	msg2 "Installing Openbazaar data"
+	install -d $pkgdir/$appdir
+	cp -r $pkgname-desktop-$pkgver $pkgdir/$appdir$pkgname
 
-msg2 "Installing execution script"
-  install -Dm755 $pkgname.sh $pkgdir/usr/bin/$pkgname
+	msg2 "Installing execution script"
+	install -Dm755 $pkgname.js $pkgdir/usr/bin/$pkgname
 
-msg2 "Installing icons and desktop menu entry"
-  install -Dm644 $pkgname-desktop-$pkgver/imgs/icon.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+	msg2 "Installing icons and desktop menu entry"
+	install -Dm644 $pkgname-desktop-$pkgver/imgs/icon.png $pkgdir/usr/share/pixmaps/$pkgname.png
+	install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
 
 md5sums=('3bea757fb365f59794a751598bfb2024'
-         'a4eb003ad61dc2536ff5a3241b3aa19e'
-         'f48876b52eee00c24abb7bbbb53d8e6c')
+         '122a3e23d7ecfef0a82e756cb97c3e98'
+         'f48876b52eee00c24abb7bbbb53d8e6c'
+         '90f70698f1593b1dda1349b1353451fd')
diff --git a/icons.patch b/icons.patch
new file mode 100644
index 000000000000..2898c8765057
--- /dev/null
+++ b/icons.patch
@@ -0,0 +1,29 @@
+diff --git a/main.js b/main.js
+index 69b9bd8c2..545bbe7e1 100644
+--- a/main.js
++++ b/main.js
+@@ -378,8 +378,12 @@ function createWindow() {
+   });
+ 
+   // put logic here to set tray icon based on OS
+-  const osTrayIcon = 'openbazaar-mac-system-tray.png';
+-
++  if (process.platform === 'linux') {
++    var osTrayIcon = 'icon.png';
++  } else {
++    var osTrayIcon = 'openbazaar-mac-system-tray.png';
++  }
++  
+   trayMenu = new Tray(`${__dirname}/imgs/${osTrayIcon}`);
+ 
+   let trayTemplate = [];
+@@ -455,7 +459,7 @@ function createWindow() {
+     center: true,
+     title: 'OpenBazaar',
+     frame: false,
+-    icon: 'imgs/openbazaar-icon.png',
++    icon: process.platform === 'linux' && `${__dirname}/imgs/icon.png`,
+   });
+ 
+   // and load the index.html of the app.
+
diff --git a/openbazaar.js b/openbazaar.js
new file mode 100755
index 000000000000..1d7a2c55b571
--- /dev/null
+++ b/openbazaar.js
@@ -0,0 +1,30 @@
+#!/usr/bin/electron
+
+const name = 'openbazaar';
+
+const {app} = require('electron');
+const fs = require('fs');
+const path = require('path');
+
+// Change command name.
+const fd = fs.openSync('/proc/self/comm', fs.constants.O_WRONLY);
+fs.writeSync(fd, name);
+fs.closeSync(fd);
+
+// Remove first command line argument (/usr/bin/electron).
+process.argv.splice(0, 1);
+
+// Set application paths.
+const appPath = path.join(path.dirname(__dirname), 'lib', name);
+const packageJson = require(path.join(appPath, 'package.json'));
+const productName = packageJson.productName;
+app.setAppPath(appPath);
+app.setDesktopName(name + '.desktop');
+app.setName(productName);
+app.setPath('userCache', path.join(app.getPath('cache'), productName));
+app.setPath('userData', path.join(app.getPath('appData'), productName));
+app.setVersion(packageJson.version);
+
+// Run the application.
+require('module')._load(appPath, module, true);
+
diff --git a/openbazaar.sh b/openbazaar.sh
deleted file mode 100644
index a28a2e2017d1..000000000000
--- a/openbazaar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /opt/
-NODE_ENV=production electron openbazaar.asar "$@"
-#NODE_ENV=development electron openbazaar.asar "$@"