summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD79
-rwxr-xr-xopenbazaar.js2
3 files changed, 48 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46d9e79faf10..b55d19ebff0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
pkgbase = openbazaar-git
pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon (Latest devel version)
- pkgver = v2.3.2.r30.g8d8ba5e9
+ pkgver = v2.4.10.r0.gf724cf15
pkgrel = 1
url = https://github.com/OpenBazaar/openbazaar-desktop
install = openbazaar.install
- arch = any
+ arch = i686
+ arch = x86_64
license = MIT
makedepends = git
makedepends = npm
- depends = electron4
+ depends = electron6
+ optdepends = openbazaard-git: server daemon occasionally needed by front-end
conflicts = openbazaar
options = !strip
source = openbazaar::git+https://github.com/OpenBazaar/openbazaar-desktop.git
source = openbazaar.js
source = openbazaar.desktop
md5sums = SKIP
- md5sums = d3904de13c80ae0769b8e686e239d4b6
+ md5sums = 8359716a04cff2fd8499406408b6c590
md5sums = a278f17aa965510cadb534df49b245dd
pkgname = openbazaar-git
diff --git a/PKGBUILD b/PKGBUILD
index 0f1f1c92418a..a196566b8354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,64 @@
# Maintainer: robertfoster
pkgname=openbazaar-git
-pkgver=v2.3.2.r30.g8d8ba5e9
+pkgver=v2.4.10.r0.gf724cf15
pkgrel=1
pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon (Latest devel version)"
-arch=(any)
+arch=(i686 x86_64)
url="https://github.com/OpenBazaar/openbazaar-desktop"
license=('MIT')
-depends=('electron4')
+depends=('electron6')
+optdepends=('openbazaard-git: server daemon occasionally needed by front-end')
makedepends=('git' 'npm')
conflicts=('openbazaar')
source=("${pkgname%%-git}::git+https://github.com/OpenBazaar/openbazaar-desktop.git"
- "${pkgname%%-git}.js"
- "${pkgname%%-git}.desktop"
+ "${pkgname%%-git}.js"
+ "${pkgname%%-git}.desktop"
)
install=${pkgname%%-git}.install
options=('!strip')
-build(){
- cd $srcdir/${pkgname%%-git}
+prepare() {
+ cd $srcdir/${pkgname%%-git}
+ sed -i '/electron/d' package.json
+ npm install --save node-sass@5.0.0
+ npm install --silent
+}
- npm install --silent
- npm run build
+build() {
+ cd $srcdir/${pkgname%%-git}
+ npm run build
}
-package(){
- cd $srcdir
- appdir="usr/lib/${pkgname%%-git}"
-
- msg2 "Installing Openbazaar data"
- install -d $pkgdir/${appdir%%/${pkgname%%-git}}
- cp -rf ${pkgname%%-git} $pkgdir/$appdir
-
- msg2 "Installing execution script"
- install -Dm755 ${pkgname%%-git}.js $pkgdir/usr/bin/${pkgname%%-git}
-
- msg2 "Installing icons and desktop menu entry"
- install -Dm644 ${pkgname%%-git}/imgs/icon.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}2.png
- install -Dm644 ${pkgname%%-git}.desktop $pkgdir/usr/share/applications/${pkgname%%-git}.desktop
-
- # Cleanup
- cd $pkgdir/$appdir
- rm -rf .git*
- rm -rf .travis
- cp -rf prod/* js/
- find "${pkgdir}"/${appdir} \
- -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 '{}' \;
+package() {
+ cd $srcdir
+ appdir="usr/lib/${pkgname%%-git}"
+
+ install -d $pkgdir/${appdir%%/${pkgname%%-git}}
+ cp -rf ${pkgname%%-git} $pkgdir/$appdir
+ install -Dm755 ${pkgname%%-git}.js $pkgdir/usr/bin/${pkgname%%-git}
+ install -Dm644 ${pkgname%%-git}/imgs/icon.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}2.png
+ install -Dm644 ${pkgname%%-git}.desktop $pkgdir/usr/share/applications/${pkgname%%-git}.desktop
+
+ cd $pkgdir/$appdir
+ rm -rf .git*
+ rm -rf .travis
+ cp -rf prod/* js/
+ find "${pkgdir}"/${appdir} \
+ -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 '{}' \;
+ pathtoreplace=$(echo ${srcdir}/ | sed 's:/:\\\/:g')
+ find "$pkgdir/$appdir/node_modules/" -name "*.json" -exec \
+ sed -i "s/$pathtoreplace//g" {} +
}
pkgver() {
- cd $srcdir/${pkgname%%-git}
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ cd $srcdir/${pkgname%%-git}
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
md5sums=('SKIP'
- 'd3904de13c80ae0769b8e686e239d4b6'
-'a278f17aa965510cadb534df49b245dd')
+ '8359716a04cff2fd8499406408b6c590'
+ 'a278f17aa965510cadb534df49b245dd')
diff --git a/openbazaar.js b/openbazaar.js
index 5bcc9b291718..b2c0d1183701 100755
--- a/openbazaar.js
+++ b/openbazaar.js
@@ -1,4 +1,4 @@
-#!/usr/bin/electron4
+#!/usr/bin/electron6
const name = 'openbazaar';