updated to latest release, modified depends to use electron, refactored pkgbuild, and removed patch (not needed with electron it seems)

1 files changed, 22 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 75af3e509d23..ab71a5613c3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,41 @@
 # Maintainer: Samuel Walladge <samuel at swalladge dot id dot au>
 
 pkgname=tagspaces
-pkgver=2.1.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="TagSpaces is an open source personal data manager. It helps you organize files with tags on every platform."
 arch=("i686" "x86_64")
 url="http://tagspaces.org"
 license=("AGPL")
-depends=("node-webkit")
-makedepends=("gendesk" "npm")
-sha256sums=('00665595b6b2b63b7792271219ac88808bcc5b2cd41cbefd59af7e92b8010d6c'
-            '5b7605288e221a852a9d7138efbccf15ca524607074b663527ce32e159a49596')
-source=("https://github.com/uggrock/tagspaces/archive/v${pkgver}.tar.gz"
-        "patch")
+depends=("electron")
+makedepends=("bower" "gendesk")
+sha256sums=('3997522914c6809503147abd200213811eba559cd346a35fc4b3b61b5c02987c')
+source=("https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
 
 prepare() {
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec='nw /opt/'${pkgname}'/data/node-webkit/'
-  echo "nw /opt/${pkgname}/data/node-webkit/" > $pkgname
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/${source[1]}
+  # create desktop file and run script
+  gendesk -f -n --pkgname ${pkgname} --pkgdesc "${pkgdesc}" --exec="cd /opt/${pkgname}/data/ && electron ."
+  echo "cd /opt/${pkgname}/data/ && electron ." > ${pkgname}
 }
 
 build() {
   (
-  cd $srcdir/${pkgname}-${pkgver}/data
-  npm install bower
-  ./node_modules/bower/bin/bower install
+  cd ${srcdir}/${pkgname}-${pkgver}/data
+  bower install
   )
 }
 
 package() {
-  msg2 "create path and copy files"
-  mkdir -p $pkgdir/opt/${pkgname}
-  cp -R $srcdir/${pkgname}-${pkgver}/* $pkgdir/opt/${pkgname}
-  sed -i "s/@@VERSION.@@BUILD.@@BID/${pkgver}-${pkgrel}/g" $pkgdir/opt/tagspaces/data/about.html
-  sed -i "s/@@VERSION.@@BUILD/${pkgver}/g" $pkgdir/opt/tagspaces/data/about.html
-#  patch -d $pkgdir/opt/tagspaces -p1 < patch.patch
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/${pkgname}-${pkgver}/data/assets/icon.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  # copy files
+  mkdir -p ${pkgdir}/opt/${pkgname}
+  cp -R ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/opt/${pkgname}
+
+  # modify version info for this package
+  sed -i "s/@@VERSION.@@BUILD.@@BID/${pkgver}-${pkgrel}/g" ${pkgdir}/opt/tagspaces/data/about.html
+  sed -i "s/@@VERSION.@@BUILD/${pkgver}/g" ${pkgdir}/opt/tagspaces/data/about.html
+
+  # install desktop file, icon, and run script
+  install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/data/assets/icon.svg ${pkgdir}/usr/share/pixmaps/${pkgname}.svg
 }