cleaned up pkgbuild file, added electron dependency since a lot of stuff is missing without (when building in clean chroot)

2 files changed, 43 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11a46a5d449c..a95b901d32dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = tusk
 	pkgdesc = Refined Evernote desktop app
 	pkgver = 0.21.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/klaussinani/tusk
 	arch = x86_64
 	license = MIT
-	makedepends = nodejs
 	makedepends = npm
 	depends = xdg-utils
-	depends = dbus
-	depends = glib2
+	depends = electron
 	source = tusk-0.21.0.tar.gz::https://github.com/klaussinani/tusk/archive/v0.21.0.tar.gz
 	source = tusk.desktop
 	source = tusk.png
diff --git a/PKGBUILD b/PKGBUILD
index d2d0ab9c77e7..b3f2628f20b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,33 +5,51 @@
 
 pkgname=tusk
 pkgver=0.21.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Refined Evernote desktop app"
 arch=('x86_64')
 url="https://github.com/klaussinani/tusk"
+
 license=('MIT')
-makedepends=('nodejs' 'npm')
-depends=('xdg-utils' 'dbus' 'glib2')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/klaussinani/tusk/archive/v${pkgver}.tar.gz"
-        $pkgname.desktop
-        $pkgname.png)
-sha256sums=('c7db7d3ef890dbc39fe13239eb6078f085d99153649c37bec99feed511135b32'
-            'b72cfcd35a727cb982f82d9f97f9e4330e81fbc70af47d1bc7f5baa7837a29f3'
-            '2e8e1f13a86bd4a8fdbd2a4a69cde6b09e035b31352ad60f5a81d61a7abfe5bf')
+makedepends=('npm')
+depends=('xdg-utils' 'electron')
+
+source=(
+    "$pkgname-$pkgver.tar.gz::https://github.com/klaussinani/tusk/archive/v${pkgver}.tar.gz"
+    "$pkgname.desktop"
+    "$pkgname.png"
+)
+
+sha256sums=(
+    'c7db7d3ef890dbc39fe13239eb6078f085d99153649c37bec99feed511135b32'
+    'b72cfcd35a727cb982f82d9f97f9e4330e81fbc70af47d1bc7f5baa7837a29f3'
+    '2e8e1f13a86bd4a8fdbd2a4a69cde6b09e035b31352ad60f5a81d61a7abfe5bf'
+)
+
+build() {
+    cd $srcdir/$pkgname-$pkgver
+    npm install --cache "${srcdir}/npm-cache"
+    node ./node_modules/electron-builder/out/cli/cli.js build -l dir --x64
+}
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -vDm644 ./license.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  npm install
-  node ./node_modules/electron-builder/out/cli/cli.js build -l dir --x64
-  cd ./dist/linux-unpacked
-  install -vDm644 -t "$pkgdir/usr/lib/$pkgname" ./*.pak ./*.dat ./*.bin
-  install -vDm644 -t "$pkgdir/usr/lib/$pkgname/locales" ./locales/*
-  install -vDm644 -t "$pkgdir/usr/lib/$pkgname/resources" ./resources/*
-  install -vDm755 -t "$pkgdir/usr/lib/$pkgname" ./*.so tusk
-  install -vdm755 "$pkgdir/usr/bin"
-  ln -sf /usr/lib/tusk/tusk "$pkgdir/usr/bin/tusk"
-  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" ./LICENSE*
-  install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  install -vDm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+    cd "$srcdir/$pkgname-${pkgver}/dist/linux-unpacked"
+    install -Dm644 -t "${pkgdir}/usr/lib/${pkgname}" ./*.pak ./*.dat ./*.bin
+    install -Dm644 -t "${pkgdir}/usr/lib/${pkgname}/locales" ./locales/*
+    install -Dm644 -t "${pkgdir}/usr/lib/${pkgname}/resources" ./resources/*
+    install -Dm755 -t "${pkgdir}/usr/lib/${pkgname}" ./libffmpeg.so
+    install -Dm755 -t "${pkgdir}/usr/lib/${pkgname}" ./${pkgname}
+    
+    # electron is required for several libs, so we use the libnode.so provided by electron itself
+    ln -sf "/usr/lib/electron/libnode.so" "${pkgdir}/usr/lib/${pkgname}/libnode.so"
+    install -dm755 "${pkgdir}/usr/bin"
+    ln -sf "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    
+    # licenses
+    cd "${srcdir}/$pkgname-${pkgver}"
+    install -Dm644 "./license.md" "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+    cd "$srcdir/$pkgname-${pkgver}/dist/linux-unpacked"
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ./LICENSE*
+    install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }