Some fixes

4 files changed, 50 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6003716d9833..681145bfc5eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
-# Generated by mksrcinfo v8
-# Fri Sep 29 08:47:22 UTC 2017
 pkgbase = trello
 	pkgdesc = Unofficial Trello Desktop app
 	pkgver = 0.1.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/danielchatfield/trello-desktop
 	arch = any
 	license = MIT
 	makedepends = yarn
 	depends = electron
-	source = https://github.com/danielchatfield/trello-desktop/archive/v0.1.9/trello-0.1.9.tar.gz
-	source = trello
-	source = trello.desktop
+	provides = trello
+	conflicts = trello-bin
+	conflicts = trello-git
+	source = trello-0.1.9.tar.gz::https://github.com/danielchatfield/trello-desktop/archive/v0.1.9.tar.gz
 	sha256sums = 8c028ee831b2deddb7b35e368540832f05d58ae9904730d0c1200ec5096cf8f2
-	sha256sums = ab377d6e3babc0710c68def9c104aa9d31aea35eb35d0131594c46dbec22d7bf
-	sha256sums = 1c0a41f7fe942bc9ba442b84e99e345112c3037051a88aab250c5fa287b93f52
 
 pkgname = trello
 
diff --git a/PKGBUILD b/PKGBUILD
index 42af168b955b..7620d3f67ae7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,55 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=trello
-pkgver=0.1.9
-pkgrel=1
+# Maintainer: ValHue <vhuelamo at gmail dot com>
+#
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
+#
+pkgname="trello"
+pkgver="0.1.9"
+pkgrel="2"
 pkgdesc="Unofficial Trello Desktop app"
-arch=(any)
+arch=('any')
 url="https://github.com/danielchatfield/trello-desktop"
 license=('MIT')
-depends=("electron")
-makedepends=("yarn")
-source=("https://github.com/danielchatfield/trello-desktop/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-        "trello"
-        "trello.desktop")
-sha256sums=('8c028ee831b2deddb7b35e368540832f05d58ae9904730d0c1200ec5096cf8f2'
-            'ab377d6e3babc0710c68def9c104aa9d31aea35eb35d0131594c46dbec22d7bf'
-            '1c0a41f7fe942bc9ba442b84e99e345112c3037051a88aab250c5fa287b93f52')
+depends=('electron')
+makedepends=('yarn')
+conflicts=('trello-bin' 'trello-git')
+provides=("${pkgname}")
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+
+sha256sums=('8c028ee831b2deddb7b35e368540832f05d58ae9904730d0c1200ec5096cf8f2')
+
+_trello="#!/bin/bash
+exec electron --app=/usr/lib/trello \"\$@\""
+
+_trello_desktop="[Desktop Entry]
+Name=Trello
+Exec=trello
+Terminal=false
+Type=Application
+Icon=trello
+Categories=Network;"
+
+prepare() {
+    cd "${srcdir}"
+    echo -e "$_trello" | tee trello
+    echo -e "$_trello_desktop" | tee trello.desktop
+}
 
 build() {
-    cd "$srcdir"/$pkgname-desktop-$pkgver
+    cd "${srcdir}"/${pkgname}-desktop-${pkgver}
     yarn install --prod
 }
 
 package() {
-    cd "$srcdir"
-    install -dm755 "$pkgdir"/usr/lib
-    install -Dm644 $pkgname-desktop-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-    install -Dm644 $pkgname-desktop-$pkgver/static/Icon.png "$pkgdir"/usr/share/pixmaps/trello.png
-    rm -rf $pkgname-desktop-$pkgver/{static,media,LICENSE}
-    mv $pkgname-desktop-$pkgver "$pkgdir"/usr/lib/trello
-    install -Dm755 trello "$pkgdir"/usr/bin/trello
-    install -Dm644 trello.desktop "$pkgdir"/usr/share/applications/trello.desktop
+    cd "${srcdir}"
+    install -dm755 "${pkgdir}"/usr/lib
+    install -Dm644 ${pkgname}-desktop-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+    install -Dm644 ${pkgname}-desktop-${pkgver}/static/Icon.png "${pkgdir}"/usr/share/pixmaps/trello.png
+
+    rm -rf ${pkgname}-desktop-${pkgver}/{static,media,LICENSE}
+    mv ${pkgname}-desktop-${pkgver} "${pkgdir}"/usr/lib/trello
+
+    install -Dm755 trello "${pkgdir}"/usr/bin/trello
+    install -Dm644 trello.desktop "${pkgdir}"/usr/share/applications/trello.desktop
 }
+
+# vim:set ts=4 sw=4 et syn=sh ft=sh:
diff --git a/trello b/trello
deleted file mode 100644
index 054ce17aeb3e..000000000000
--- a/trello
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec electron --app=/usr/lib/trello "$@"
diff --git a/trello.desktop b/trello.desktop
deleted file mode 100644
index 5e6c7670eb50..000000000000
--- a/trello.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Trello
-Exec=trello
-Terminal=false
-Type=Application
-Icon=trello
-Categories=Network;