summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO39
-rw-r--r--PKGBUILD79
-rw-r--r--openbazaar.desktop9
-rw-r--r--openbazaar.install44
-rw-r--r--openbazaar.pngbin0 -> 9755 bytes
-rw-r--r--[-rwxr-xr-x]openbazaar.sh6
6 files changed, 54 insertions, 123 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dbd428317650..4b22f648bfd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,27 @@
+# Generated by mksrcinfo v8
+# Tue Dec 29 11:38:06 UTC 2015
pkgbase = openbazaar-git
- pkgdesc = A decentralized marketplace proof of concept. It is based off of the POC code by the darkmarket team and protected by the GPL
- pkgver = 4079.c77f9ae
+ pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon
+ pkgver = 1158.0412ce6
pkgrel = 1
url = http://openbazaar.org
install = openbazaar.install
arch = any
license = MIT
makedepends = git
- depends = curl
- depends = jquery
- depends = python2-bitcoin
- depends = python2-dnschain
- depends = python2-gnupg-hg
- depends = python2-ipy
- depends = python2-miniupnpc
- depends = python2-obelisk
- depends = python2-pillow
- depends = python2-psutil
- depends = python2-pycountry
- depends = python2-pyee
- depends = python2-pyelliptic
- depends = python2-pystun
- depends = python2-qrcode
- depends = python2-requests
- depends = python2-rfc3986
- depends = python2-tornado
+ makedepends = npm
+ depends = electron
provides = openbazaar
replaces = openbazaar
options = !strip
- backup = etc/openbazaar.conf
- source = openbazaar::git+https://github.com/OpenBazaar/OpenBazaar.git#branch=develop
- source = openbazaar.service
+ source = openbazaar::git+https://github.com/OpenBazaar/OpenBazaar-Client.git
source = openbazaar.sh
- source = openbazaar.conf
+ source = openbazaar.desktop
+ source = openbazaar.png
md5sums = SKIP
- md5sums = 1d1e3933c4fd26f565e47f475eede2b4
- md5sums = 87ad334f35bce82931151fa94c06bab1
- md5sums = 0741fc4c68e499b10cbf272f27efd3a0
+ md5sums = 2f915aa854435ce7cd1dfca4eccd0112
+ md5sums = b96363637323c19b075c68543a65f808
+ md5sums = 71fc6ef0cc128dc1d00eff33c12c66cb
pkgname = openbazaar-git
diff --git a/PKGBUILD b/PKGBUILD
index e17b2093562a..0fdc2e7b94c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,72 +2,47 @@
_pkgname=openbazaar
pkgname=${_pkgname}-git
-pkgver=4079.c77f9ae
+pkgver=1158.0412ce6
pkgrel=1
-pkgdesc="A decentralized marketplace proof of concept. It is based off of the POC code by the darkmarket team and protected by the GPL"
+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)
+makedepends=(git npm)
+source=(
+ "${_pkgname}::git+https://github.com/OpenBazaar/OpenBazaar-Client.git"
+ "${_pkgname}.sh"
+ "${_pkgname}.desktop"
+ "${_pkgname}.png"
-makedepends=(git)
-source=("${_pkgname}::git+https://github.com/OpenBazaar/OpenBazaar.git#branch=develop"
- ${_pkgname}.service
- ${_pkgname}.sh
- ${_pkgname}.conf
-# gnupg1.patch
)
-backup=('etc/openbazaar.conf')
install=${_pkgname}.install
options=('!strip')
provides=(${_pkgname})
replaces=(${_pkgname})
-package(){
+build(){
cd $srcdir/${_pkgname}
+ npm install
+}
- msg2 "Install systemd service"
- install -Dm644 $srcdir/${_pkgname}.service $pkgdir/usr/lib/systemd/system/${_pkgname}.service
-
- msg2 "Install ${_pkgname} sample conf in /etc/${_pkgname}.conf"
- install -Dm644 $srcdir/${_pkgname}.conf $pkgdir/etc/${_pkgname}.conf
+package(){
- msg2 "Install ${_pkgname} scripts"
+msg2 "Installing Openbazaar data"
+ install -dm755 $pkgdir/opt/
+ cp -r $srcdir/${_pkgname} $pkgdir/opt/
+
+
+msg2 "Installing execution script"
install -Dm755 $srcdir/${_pkgname}.sh $pkgdir/usr/bin/${_pkgname}
+
- msg2 "Create folder for user ${_pkgname}"
- cd installers/ubuntu
- cat build | head -n -2 > create_folders
- python2 create_folders
- install -dm755 $pkgdir/var/lib/
-
- cp -r output/usr/share/${_pkgname} $pkgdir/var/lib/
- cp -r $srcdir/${_pkgname}/rudp $pkgdir/var/lib/${_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
- msg2 "Python2 bytecode generation"
- cd $pkgdir/var/lib/${_pkgname}/ && python2 -m compileall .
+msg2 "Installing icons and desktop menu entry"
+ install -Dm644 $srcdir/${_pkgname}.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/openbazaar.png
+ install -Dm644 $srcdir/${_pkgname}.desktop "$pkgdir"/usr/share/applications/openbazaar.desktop
}
pkgver() {
@@ -76,6 +51,6 @@ pkgver() {
}
md5sums=('SKIP'
- '1d1e3933c4fd26f565e47f475eede2b4'
- '87ad334f35bce82931151fa94c06bab1'
- '0741fc4c68e499b10cbf272f27efd3a0')
+ '2f915aa854435ce7cd1dfca4eccd0112'
+ 'b96363637323c19b075c68543a65f808'
+ '71fc6ef0cc128dc1d00eff33c12c66cb')
diff --git a/openbazaar.desktop b/openbazaar.desktop
new file mode 100644
index 000000000000..de029481f77c
--- /dev/null
+++ b/openbazaar.desktop
@@ -0,0 +1,9 @@
+[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
+Icon=/usr/share/icons/hicolor/128x128/apps/openbazaar.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/openbazaar.install b/openbazaar.install
index 191529222ec2..159de68ac1b3 100644
--- a/openbazaar.install
+++ b/openbazaar.install
@@ -1,48 +1,12 @@
-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
}
+
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
}
diff --git a/openbazaar.png b/openbazaar.png
new file mode 100644
index 000000000000..7b66cacfac35
--- /dev/null
+++ b/openbazaar.png
Binary files differ
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