openbazaar: 2.0.18

3 files changed, 21 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f9c8fa13dfe..2167a8ef2e97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov 16 17:25:13 UTC 2017
+# Wed Nov 29 13:15:04 UTC 2017
 pkgbase = openbazaar
 	pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon
-	pkgver = 2.0.17
-	pkgrel = 3
+	pkgver = 2.0.18
+	pkgrel = 1
 	url = http://openbazaar.org
 	install = openbazaar.install
 	arch = i686
@@ -12,14 +12,12 @@ pkgbase = openbazaar
 	makedepends = npm
 	depends = electron
 	options = !strip
-	source = https://github.com/OpenBazaar/openbazaar-desktop/archive/v2.0.17.tar.gz
+	source = https://github.com/OpenBazaar/openbazaar-desktop/archive/v2.0.18.tar.gz
 	source = openbazaar.js
 	source = openbazaar.desktop
-	source = icons.patch
-	md5sums = 3bea757fb365f59794a751598bfb2024
+	md5sums = 245c699cbca72ee71c7cdc1487cb285f
 	md5sums = 122a3e23d7ecfef0a82e756cb97c3e98
 	md5sums = 43c9c9ef1d3ca873eea6b6343ca072e8
-	md5sums = c8d61887729b1326c611aafba89e0df1
 
 pkgname = openbazaar
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a70d9065e69..e009ed6b39ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: robertfoster
 
 pkgname=openbazaar
-pkgver=2.0.17
-pkgrel=3
+pkgver=2.0.18
+pkgrel=1
 pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon"
 arch=(i686 x86_64)
 url="http://openbazaar.org"
@@ -12,17 +12,14 @@ makedepends=(npm)
 source=("https://github.com/OpenBazaar/openbazaar-desktop/archive/v$pkgver.tar.gz"
 	"$pkgname.js"
 	"$pkgname.desktop"
-	icons.patch
 )
 install=$pkgname.install
 options=('!strip')
 
 build(){
 	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
 }
@@ -41,9 +38,20 @@ package(){
 	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
+
+	# Clean up
+	find "${pkgdir}"${appdir} \
+		-name "package.json" \
+            	-exec sed -e "s|${srcdir}/${pkgname}-${pkgver}|${appdir}|" \
+                -i {} \; \
+	        -or -name ".*" -prune -exec rm -r '{}' \; \
+        	-or -name "bin" -prune -exec rm -r '{}' \; \
+	        -or -name "example" -prune -exec rm -r '{}' \; \
+        	-or -name "examples" -prune -exec rm -r '{}' \; \
+	        -or -name "test" -prune -exec rm -r '{}' \; \
+        	-or -executable -type f -exec rm -r '{}' \;
 }
 
-md5sums=('3bea757fb365f59794a751598bfb2024'
+md5sums=('245c699cbca72ee71c7cdc1487cb285f'
          '122a3e23d7ecfef0a82e756cb97c3e98'
-         '43c9c9ef1d3ca873eea6b6343ca072e8'
-         'c8d61887729b1326c611aafba89e0df1')
+         '43c9c9ef1d3ca873eea6b6343ca072e8')
diff --git a/icons.patch b/icons.patch
deleted file mode 100644
index c183db1b1a83..000000000000
--- a/icons.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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: `${__dirname}/imgs/icon.png`,
-   });
- 
-   // and load the index.html of the app.
-