Add build step and desktop launcher

4 files changed, 47 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1305499f7df1..a4e71371228b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,18 @@
-pkgbase = bitaddress
+pkgbase = bitaddress-git
 	pkgdesc = JavaScript Client-Side Bitcoin Wallet Generator
-	pkgver = 2.9.8
+	pkgver = v2.9.8.r0.g6ad40b3
 	pkgrel = 1
-	url = https://github.com/pointbiz/bitaddress.org
+	url = https://www.bitaddress.org
 	arch = any
 	license = MIT
+	makedepends = nodejs-grunt-cli
 	provides = bitsquare
-	source = bitaddress::git+https://github.com/pointbiz/bitaddress.org.git
+	source = bitaddress-git::git+https://github.com/pointbiz/bitaddress.org.git
+	source = bitaddress.sh
+	source = bitaddress.desktop
 	sha256sums = SKIP
+	sha256sums = a5798c819761e4367e307c2eba3d29232b65b6f44ae80827fbd18783a55acd7e
+	sha256sums = 5208ec3016cf12a7f1b1d62802cd488817aa3cef26fb7e672b52251cd40af276
 
-pkgname = bitaddress
+pkgname = bitaddress-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cc3bef8cf03..32a9ed45be6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,42 @@
 # Maintainer: David Parrish <daveparrish@gmail.com>
 
-pkgname=bitaddress
-pkgver=2.9.8
+pkgname=bitaddress-git
+pkgver=v2.9.8.r0.g6ad40b3
 pkgrel=1
 pkgdesc="JavaScript Client-Side Bitcoin Wallet Generator"
 arch=('any')
-url="https://github.com/pointbiz/bitaddress.org"
+url="https://www.bitaddress.org"
 license=('MIT')
+makedepends=('nodejs-grunt-cli')
 provides=('bitsquare')
-source=("${pkgname}::git+https://github.com/pointbiz/bitaddress.org.git")
-sha256sums=("SKIP")
+source=("${pkgname}::git+https://github.com/pointbiz/bitaddress.org.git"
+  "bitaddress.sh"
+  "bitaddress.desktop")
+sha256sums=("SKIP"
+  "a5798c819761e4367e307c2eba3d29232b65b6f44ae80827fbd18783a55acd7e"
+  "5208ec3016cf12a7f1b1d62802cd488817aa3cef26fb7e672b52251cd40af276")
 
 pkgver() {
   cd "$pkgname"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+build() {
+  cd "${srcdir}/${pkgname}"
+  npm install
+  grunt
+}
+
 package() {
-  ls ${pkgname}
-#  install -d "$pkgdir"/{opt/,usr/bin/,usr/share/applications,/usr/share/pixmaps,/usr/share/licenses/$pkgname}
-#
-#  # Install all .deb files into /opt.
-#  cp -r "$srcdir/opt" "$pkgdir"
-#
-#  # Symlink some files to complete install.
-#  ln -s "/opt/$_binname/$_binname" "$pkgdir/usr/bin/$pkgname"
-#  ln -s "/opt/$_binname/${_binname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-#  ln -s "/opt/$_binname/${_binname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  # Install License (License is in README)
+  install -Dm644 $pkgname/README "$pkgdir/usr/share/licenses/$pkgname/README"
+
+  # Install html file
+  install -Dm644 $pkgname/bitaddress.org.html "$pkgdir/usr/share/$pkgname/bitaddress.org.html"
+
+  # Install binary
+  install -Dm755 bitaddress.sh "${pkgdir}/usr/bin/bitaddress"
+
+  # Install desktop launcher
+  install -Dm644 bitaddress.desktop "${pkgdir}/usr/share/applications/bitaddress.desktop"
 }
diff --git a/bitaddress.desktop b/bitaddress.desktop
new file mode 100644
index 000000000000..3f7cfa08efb1
--- /dev/null
+++ b/bitaddress.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=BitAddress
+Type=Application
+Comment=JavaScript Client-Side Bitcoin Wallet Generator
+Exec=bitaddress
+Categories=Utility;Finance;
+GenericName=Bitcoin Paper Wallet Utility
diff --git a/bitaddress.sh b/bitaddress.sh
new file mode 100755
index 000000000000..40d025beaac5
--- /dev/null
+++ b/bitaddress.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xdg-open /usr/share/bitaddress-git/bitaddress.org.html