new pkgver scheme + java 11 dependency

6 files changed, 28 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dfa42fae814..ad575eb1f0a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = runelite-git
 	pkgdesc = Open source Old School RuneScape client. (Git Version)
-	pkgver = 0.r6626.107f08f5e2
+	pkgver = 1.5.18+13+gf8fd91bb1c
 	pkgrel = 1
 	url = https://github.com/runelite/runelite
 	arch = any
 	license = BSD
 	makedepends = maven
-	depends = java-runtime>=8
-	depends = bash
+	depends = java-runtime>=11
 	depends = ttf-font
 	optdepends = gvfs: enable links
 	provides = runelite
 	conflicts = runelite
-	source = runelite-git::git+https://github.com/runelite/runelite.git
-	source = runelite
+	source = git+https://github.com/runelite/runelite.git
 	source = runelite.desktop
 	source = runelite.png
 	sha512sums = SKIP
-	sha512sums = 55635de6a1b081bedbd8efc3a6eb93cdf7623a188bc262f2182c8be6bd5ae098d0c0c5d655b3322de549916ce9cfbb47ac369c481f619f396d9167d76627b19d
-	sha512sums = e00339514623c2f683118f1cdba93cebbc0761fd72f31e2d139ed467b8c41a6738fd0f27ac2beba4d2caa2a365ef4cc49a43af54b13ca5a908e5fd11d03f4bc1
-	sha512sums = fe73d666eec61a8ac0059a56a417d3a22ccdc0d09eb567a613469af513318f4284ee70079a4d18d74cd3423c4d75ce5bb0a3c6df9f9f4532f8d5833ffe4a34ce
+	sha512sums = 532ec6105bbd13a6a977dfa0b2c79edc78d76994296b9044f9447eba2b1c118d249c4b103a94f30f22bdba2c9f214ca586fc8fde83d52e807d79a79c9ef1670d
+	sha512sums = 73e0c42f4eaf2e0adc249e471bd241e8328da7f867177535f1da206acce14801b60e69fffdbb2a10bc105f1de37b6eaaad23d5e67147b53a108b6e5bf55c586b
 
 pkgname = runelite-git
 
diff --git a/.gitignore b/.gitignore
index bd7cfa976111..b89389822a89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 pkg/
 src/
-runelite-git/
+runelite/
 *.pkg.tar.xz
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 71552bc2f446..d82c841aecaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,44 @@
 # Maintainer: Jason Stryker <public at jasonstryker dot com>
+
 pkgname=runelite-git
-pkgver=0.r6626.107f08f5e2
+_pkgname=runelite
+pkgver=1.5.18+13+gf8fd91bb1c
 pkgrel=1
 pkgdesc="Open source Old School RuneScape client. (Git Version)"
 arch=(any)
 license=('BSD')
 url="https://github.com/runelite/runelite"
-depends=('java-runtime>=8' 'bash' 'ttf-font')
+depends=('java-runtime>=11' 'ttf-font')
 optdepends=('gvfs: enable links')
 makedepends=('maven')
 provides=("runelite")
 conflicts=('runelite')
-source=("${pkgname}::git+${url}.git"
-        runelite        
+source=("git+${url}.git"
         runelite.desktop
         runelite.png)
 sha512sums=('SKIP'
-            '55635de6a1b081bedbd8efc3a6eb93cdf7623a188bc262f2182c8be6bd5ae098d0c0c5d655b3322de549916ce9cfbb47ac369c481f619f396d9167d76627b19d'
-            'e00339514623c2f683118f1cdba93cebbc0761fd72f31e2d139ed467b8c41a6738fd0f27ac2beba4d2caa2a365ef4cc49a43af54b13ca5a908e5fd11d03f4bc1'
-            'fe73d666eec61a8ac0059a56a417d3a22ccdc0d09eb567a613469af513318f4284ee70079a4d18d74cd3423c4d75ce5bb0a3c6df9f9f4532f8d5833ffe4a34ce')
+            '532ec6105bbd13a6a977dfa0b2c79edc78d76994296b9044f9447eba2b1c118d249c4b103a94f30f22bdba2c9f214ca586fc8fde83d52e807d79a79c9ef1670d'
+            '73e0c42f4eaf2e0adc249e471bd241e8328da7f867177535f1da206acce14801b60e69fffdbb2a10bc105f1de37b6eaaad23d5e67147b53a108b6e5bf55c586b')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${_pkgname}"
   
-  printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --tags | sed 's/-/+/g' | cut -d '+' -f 3-5
 }
 
-build() {
-    cd ${srcdir}/${pkgname}/runelite-client/
+build() {    
+    cd "${srcdir}/${_pkgname}/runelite-client/"
 
-    mvn clean package \
-        -Dmaven.repo.local="${srcdir}/repo" \
-        -DskipTests=true
+    mvn clean package -DskipTests=true
 }
 
 package() {
-    client_jar=$(find ${srcdir}/${pkgname}/runelite-client/target -type f -name client-*-SNAPSHOT-shaded.jar)
+    client_jar=$(find ${srcdir}/${_pkgname}/runelite-client/target -type f -name client-*-SNAPSHOT-shaded.jar)
     
     install -D -m644 \
         "${client_jar}" \
         "${pkgdir}/usr/share/runelite/RuneLite.jar"
 
-    install -D -m755 \
-        "${srcdir}/runelite" \
-        "${pkgdir}/usr/bin/runelite"
-
     install -D -m644 \
         "${srcdir}/runelite.desktop" \
         "${pkgdir}/usr/share/applications/runelite.desktop"
@@ -54,6 +48,13 @@ package() {
         "${pkgdir}/usr/share/pixmaps/runelite.png"
 
     install -D -m644 \
-        "${srcdir}/${pkgname}/LICENSE" \
+        "${srcdir}/${_pkgname}/LICENSE" \
         "${pkgdir}/usr/share/licenses/${pkgname}"
+
+    install -D -m755 \
+        "/dev/null" \
+        "${pkgdir}/usr/bin/runelite"
+
+    echo '#!/bin/sh' > "${pkgdir}/usr/bin/runelite"
+    echo 'exec java -Dhttps.protocols=TLSv1.2 -jar /usr/share/runelite/RuneLite.jar "$@"' >> "${pkgdir}/usr/bin/runelite"
 }
diff --git a/runelite b/runelite
deleted file mode 100644
index 75013830b4a1..000000000000
--- a/runelite
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec java -Dhttps.protocols=TLSv1.2 -jar /usr/share/runelite/RuneLite.jar $@
\ No newline at end of file
diff --git a/runelite.desktop b/runelite.desktop
index 2df87cd65cc7..6ac8766a6b61 100644
--- a/runelite.desktop
+++ b/runelite.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=RuneLite
+Name=RuneLite (Git Version)
 GenericName=RuneLite
 Comment=Open source Old School RuneScape client.
 Exec=runelite
diff --git a/runelite.png b/runelite.png
index 13136c8794e2..b0cc62158b78 100644
--- a/runelite.png
+++ b/runelite.png