Follow Java package guidelines

3 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5326f5990578..c9fffd00df09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 5.0.0
+# Thu Mar 31 20:13:02 UTC 2016
 pkgbase = glass
 	pkgdesc = A cross-platform assembler for the Z80 processor
 	pkgver = 0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/grauw/glass
 	arch = any
 	license = Apache
@@ -9,8 +11,8 @@ pkgbase = glass
 	noextract = glass-0.4.jar
 	source = https://bitbucket.org/grauw/glass/downloads/glass-0.4.jar
 	source = glass
-	md5sums = 7b1e56de3ec590a6a021b127a21bae55
-	md5sums = 3fa2766909bdc108dfdfdeac01f6bb04
+	sha256sums = 6f270760f650b2d02f184678356aa50b776f47ea7715ff0794efbbbef7a7d47b
+	sha256sums = 96378d1179a06aec3f405e833cb79df158c8ccad6afaa67ed34e9a9473744841
 
 pkgname = glass
 
diff --git a/PKGBUILD b/PKGBUILD
index ed27ca37c24c..41925ee649a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Sander Zuidema <archlinux at grunny dot demon dot nl>
+# Maintainer: Sander Zuidema <s.zuidema at bazix dot nl>
 
 pkgname=glass
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform assembler for the Z80 processor"
 arch=('any')
 url="https://bitbucket.org/grauw/glass"
@@ -20,18 +20,16 @@ options=()
 install=
 changelog=
 source=(
- https://bitbucket.org/grauw/glass/downloads/glass-$pkgver.jar
+ https://bitbucket.org/grauw/$pkgname/downloads/$pkgname-$pkgver.jar
  $pkgname
 )
-noextract=(glass-$pkgver.jar)
-md5sums=('7b1e56de3ec590a6a021b127a21bae55'
-         '3fa2766909bdc108dfdfdeac01f6bb04')
+noextract=($pkgname-$pkgver.jar)
 
 package() {
-  # copy files
-  cd "$srcdir"
-  mkdir -p "$pkgdir/opt/glass"
+  mkdir -p "$pkgdir/usr/share/java/$pkgname"
   mkdir -p "$pkgdir/usr/bin"
-  install -m755 glass-$pkgver.jar "$pkgdir/opt/glass/glass.jar"
-  install -m755 $pkgname "$pkgdir/usr/bin/glass"  
+  install -m755 $pkgname-$pkgver.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -m755 $pkgname "$pkgdir/usr/bin/$pkgname"
 }
+sha256sums=('6f270760f650b2d02f184678356aa50b776f47ea7715ff0794efbbbef7a7d47b'
+            '96378d1179a06aec3f405e833cb79df158c8ccad6afaa67ed34e9a9473744841')
diff --git a/glass b/glass
index 1504f84bec1d..8583d2e7e605 100755
--- a/glass
+++ b/glass
@@ -1,2 +1,2 @@
-#!/bin/bash
-exec java -jar /opt/glass/glass.jar $@
+#!/bin/sh
+exec /usr/binjava -jar '/usr/share/java/glass/glass.jar' "$@"