1.0.6

5 files changed, 49 insertions, 102 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9e6aed6cc825..259603cd7ded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,77 +1,49 @@
 #Maintainer: M0Rf30
 
 pkgname=openbazaar
-pkgver=0.5.0
+pkgver=1.0.6
 pkgrel=1
-pkgdesc="Decentralized marketplace for instantly trading with anyone using Bitcoin"
+pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon"
 arch=(any)
 url="http://openbazaar.org"
 license=('MIT')
-depends=(
-	    curl
-           #gnupg1
-	    jquery
-            python2-bitcoin
-            python2-dnschain
-            python2-gnupg-hg
-            python2-ipy
-            python2-miniupnpc
-            python2-obelisk
-            python2-pillow
-            python2-psutil
-            python2-pycountry
-            python2-pyee
-            python2-pyelliptic
-            python2-pystun
-            python2-qrcode
-            python2-requests
-            python2-rfc3986
-            python2-tornado
+depends=(electron openbazaard)
+makedepends=(git npm)
+source=(
+	"https://github.com/OpenBazaar/OpenBazaar-Client/archive/v$pkgver.tar.gz"
+	"$pkgname.sh"
+        "$pkgname.desktop"
 )
-optdepends=('pybitmessage: Send and receive messages to anyone on the bitmessage network')
-source=(https://github.com/OpenBazaar/OpenBazaar/archive/v${pkgver}.tar.gz
-	$pkgname.service
-	$pkgname.sh
-        $pkgname.conf
-	#gnupg1.patch
-)
-backup=('etc/openbazaar.conf')
 install=$pkgname.install
 options=('!strip')
-conflicts=($pkgname-git)
-
-package(){
-  cd $srcdir/OpenBazaar-$pkgver
+provides=('openbazaar')
+replaces=('openbazaar-git')
+_srcfolder=OpenBazaar-Client-$pkgver
 
-  # msg2 "Patch against Gnupg2"
-  # patch -Np1 -i ../gnupg1.patch
-
-   msg2 "Install systemd service"
-   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+build(){
+  cd $srcdir/${_srcfolder}
+  npm install --production
+}
 
-   msg2 "Install $pkgname sample conf in /etc/$pkgname.conf"
-   install -Dm644 $srcdir/$pkgname.conf $pkgdir/etc/$pkgname.conf
+package(){
 
-   msg2 "Install $pkgname scripts"
-   install -Dm755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
+msg2 "Installing Openbazaar data"
+  install -dm755 $pkgdir/opt/
+  cp -r $srcdir/${_srcfolder} $pkgdir/opt/openbazaar
 
-   msg2 "Create folder for user $pkgname"
-   cd installers/ubuntu
-   cat build | head -n -2 > create_folders
-   python2 create_folders
-   install -dm755 $pkgdir/var/lib/
+msg2 "Symlinking to allow gui to automatically call daemon"
+  ln -sr /var/lib/openbazaard $pkgdir/opt/$pkgname/OpenBazaar-Server
 
-   cp -r output/usr/share/$pkgname $pkgdir/var/lib/
-   cp -r $srcdir/OpenBazaar-$pkgver/rudp $pkgdir/var/lib/$pkgname
+msg2 "Installing execution script"
+  install -Dm755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
 
-   msg2 "Jquery symlink"
-   ln -s -r /usr/share/jquery/jquery.min.js $pkgdir/var/lib/$pkgname/html/vendors
+  rm -rf $pkgdir/opt/$pkgname/{.git*,.eslint*,.travis*}
 
-   msg2 "Python2 bytecode generation"
-   cd $pkgdir/var/lib/$pkgname/ && python2 -m compileall .
+msg2 "Installing icons and desktop menu entry"
+  install -Dm644 $srcdir/${_srcfolder}/imgs/icon.png "$pkgdir"/usr/share/pixmaps/openbazaar.png
+  install -Dm644 $srcdir/$pkgname.desktop "$pkgdir"/usr/share/applications/openbazaar.desktop
 }
 
-md5sums=('a593fb885847b7f4ac27a717c191179f'
-         '1d1e3933c4fd26f565e47f475eede2b4'
-         '87ad334f35bce82931151fa94c06bab1'
-         '0741fc4c68e499b10cbf272f27efd3a0')
+md5sums=('b5cbc19c9a2b5f9c10adb883b7c72777'
+         '2f915aa854435ce7cd1dfca4eccd0112'
+         'dbca9273e9fc18a7aa5d1c395508fe60')
diff --git a/openbazaar.desktop b/openbazaar.desktop
new file mode 100644
index 000000000000..3bc0b1906747
--- /dev/null
+++ b/openbazaar.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenBazaar
+GenericName=Decentralized marketplace for trading with anyone using Bitcoin.
+Comment=OpenBazaar is an open source project to create a decentralized network for commerce online—using Bitcoin—that has no fees and cannot be censored.
+Exec=/usr/bin/openbazaar %U
+Icon=openbazaar
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=application/x-openbazaar;x-scheme-handler/ob;
+
diff --git a/openbazaar.install b/openbazaar.install
index 191529222ec2..924ef9a45139 100644
--- a/openbazaar.install
+++ b/openbazaar.install
@@ -1,48 +1,14 @@
-usr=openbazaar
-home=/var/lib/openbazaar
-log=/var/lib/openbazaar/logs
-dbdata=obdata
-
 post_install() {
-  _mkuser
-  _mkdbfolder
-  _chown
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database
 }
 
+
 post_upgrade() {
-  _mkuser
-  _chown
+  post_install $1
 }
 
-## arg 1:  the old package version
 post_remove() {
-  #_rmuser
-  echo "Please remove $home and user $usr manually"
-  echo "WARNING!!!"
-  echo "Be sure to save your db and gpg backup"
-}
-
-_chown() {
-  chown -R $usr:$usr $home $log $home/$dbdata
-}
-
-_mkuser() {
-  getent passwd $usr &>/dev/null || {
-    echo -n "Creating openbazaar user... "
-    grep -E "^openbazaar:" /etc/group >/dev/null || groupadd $usr
-    useradd -m -d $home -g $usr -s /usr/bin/nologin $usr 2>/dev/null
-    echo "done"
-  }
-}
-
-_rmuser() {
-  echo -n "Removing openbazaar user... "
-  userdel -rf $usr 2>/dev/null
-  echo "done"
-}
-
-_mkdbfolder() {
-  echo -n "Creating database folder... "
-  mkdir -p $home/$dbdata
-  echo "done"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database
 }
diff --git a/openbazaar.png b/openbazaar.png
new file mode 100644
index 000000000000..7b66cacfac35
--- /dev/null
+++ b/openbazaar.png
diff --git a/openbazaar.sh b/openbazaar.sh
index 4507855f6723..ce176e7ed62d 100755..100644
--- a/openbazaar.sh
+++ b/openbazaar.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-cd /var/lib/openbazaar/
-COMMANDS="--config-file /etc/openbazaar.conf"
-export PYTHONPATH=/var/lib/openbazaar:/usr/lib/python2.7/site-packages/
-python2 -m node.openbazaar $COMMANDS "$@" &
+cd /opt/openbazaar
+electron main.js