summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPieter Goetschalckx2017-04-03 15:42:48 +0200
committerPieter Goetschalckx2017-04-03 15:43:41 +0200
commitbfdcdac4f2acd9c878e1cd2df462cfc48e762698 (patch)
treea1ee54a5714b77ac0d6b498f60e911a6beb1f32e
parent388432a75fa3bacc09f842fa00af5d53729881b2 (diff)
downloadaur-bfdcdac4f2acd9c878e1cd2df462cfc48e762698.tar.gz
Use system electron
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD33
-rwxr-xr-xwebtorrent-desktop2
3 files changed, 28 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 39ceee3df759..9aa962ef7c8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
pkgbase = webtorrent-desktop
pkgdesc = Streaming torrent client.
pkgver = 0.18.0
- pkgrel = 1
+ pkgrel = 2
url = https://webtorrent.io/desktop
arch = i686
arch = x86_64
license = MIT
makedepends = npm
- makedepends = git
- makedepends = zip
depends = gconf
+ depends = electron
conflicts = webtorrent-desktop-git
conflicts = webtorrent-desktop-bin
+ options = !strip
source = https://github.com/feross/webtorrent-desktop/archive/v0.18.0.tar.gz
+ source = webtorrent-desktop
source = webtorrent-desktop.desktop
sha256sums = 25b92aab9cc6d076715a12bdaeae950f6885da19d87948a6acf007ba246b9494
+ sha256sums = b5b71281c1c93a60ff3d7219d005c33754d0e0cc9076c152b0a68615929bb5a3
sha256sums = 4eba7b17fd0cd90f77fc1a1005f74d8fcd93dac4f669d1b1abbf71734b5bafa6
pkgname = webtorrent-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 4480036ed1f3..de72ada68767 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,49 @@
pkgname=webtorrent-desktop
pkgver=0.18.0
-pkgrel=1
+pkgrel=2
pkgdesc="Streaming torrent client."
arch=('i686' 'x86_64')
url="https://webtorrent.io/desktop"
license=('MIT')
-depends=('gconf')
-makedepends=('npm' 'git' 'zip')
+depends=('gconf' 'electron')
+makedepends=('npm')
conflicts=('webtorrent-desktop-git' 'webtorrent-desktop-bin')
+options=(!strip)
source=("https://github.com/feross/${pkgname}/archive/v${pkgver}.tar.gz"
+ "webtorrent-desktop"
"${pkgname}.desktop")
sha256sums=('25b92aab9cc6d076715a12bdaeae950f6885da19d87948a6acf007ba246b9494'
+ 'b5b71281c1c93a60ff3d7219d005c33754d0e0cc9076c152b0a68615929bb5a3'
'4eba7b17fd0cd90f77fc1a1005f74d8fcd93dac4f669d1b1abbf71734b5bafa6')
[ "$CARCH" = "i686" ] && _platform=ia32
[ "$CARCH" = "x86_64" ] && _platform=x64
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ sed -i '/"electron.*":/d' package.json
+}
+
build() {
cd "$pkgname-$pkgver"
npm install
- npm run package -- linux --package=zip
+ npm dedupe
+ npm run build
+ npm prune --production
}
package() {
- cd "$pkgname-$pkgver/dist"
-
- install -dm755 "${pkgdir}/usr/share"
- install -dm755 "${pkgdir}/usr/bin"
+ cd "$pkgname-$pkgver"
- cp -a "WebTorrent-linux-${_platform}" "${pkgdir}/usr/share/${pkgname}"
- ln -s "/usr/share/${pkgname}/WebTorrent" "${pkgdir}/usr/bin/${pkgname}"
+ install -dm755 "${pkgdir}/usr/lib/${pkgname}"
+ cp -a build index.js node_modules package.json static "${pkgdir}/usr/lib/${pkgname}/"
+ install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 "${srcdir}/$pkgname-$pkgver/static/WebTorrent.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.png"
+ install -Dm644 "static/WebTorrent.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.png"
- install -Dm644 "WebTorrent-linux-${_platform}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/webtorrent-desktop b/webtorrent-desktop
new file mode 100755
index 000000000000..f34e667c59c5
--- /dev/null
+++ b/webtorrent-desktop
@@ -0,0 +1,2 @@
+#!/usr/bin/sh
+electron /usr/lib/webtorrent-desktop