Release v0.6

4 files changed, 47 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cee9f6ce0a84..9533cc0d7701 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,24 @@
 pkgbase = lizzie
 	pkgdesc = Analysis interface for Leela Zero
-	pkgver = 0.5
+	pkgver = 0.6
 	pkgrel = 1
 	url = https://github.com/featurecat/lizzie
 	arch = x86_64
 	license = GPLv3
 	makedepends = git
 	makedepends = maven
+	makedepends = curl
 	depends = bash
 	depends = java-runtime
-	depends = leela-zero-git
-	source = lizzie::git+https://github.com/apetresc/lizzie#tag=v0.5-apetresc
+	depends = leela-zero
+	source = https://github.com/featurecat/lizzie/archive/0.6.tar.gz
+	source = winrate.patch::https://github.com/featurecat/lizzie/commit/d50f73a2cfb14b8f79c315f4057de8350bd5cfe5.patch
+	source = lizzie.sh
 	source = lizzie.desktop
-	md5sums = SKIP
-	md5sums = 1fefb91214fd8fd2f1241de2b73f8701
+	sha256sums = 0bc244914d80d7fecab1ef22e6ad2a540992019734e4081138bb9cf757bc79cd
+	sha256sums = babc24f1bdd9e5c6315aff72eb6881489ec6ea0cae8bf277285a019c918dd665
+	sha256sums = 58a4987ab4167aab557e1bcd2bb22daec252ce7c6397e76040c038516b74de70
+	sha256sums = cf5d1651023f04294e580243aa7ef05bc9ebedb468631f4035fd3d5ce0f212f0
 
 pkgname = lizzie
 
diff --git a/PKGBUILD b/PKGBUILD
index a50388294d53..f5404b29bf1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,51 @@
-# Contributor: Adrian Petrescu <apetresc at gmail dot com>
 # Maintainer: Adrian Petrescu <apetresc at gmail dot com>
+# Contributor: algebro <algebro at tuta dot io>
 
 pkgname=lizzie
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc="Analysis interface for Leela Zero"
 arch=('x86_64')
 url="https://github.com/featurecat/lizzie"
 license=('GPLv3')
-depends=('bash' 'java-runtime' 'leela-zero-git')
-makedepends=('git' 'maven')
-source=("${pkgname}::git+https://github.com/apetresc/lizzie#tag=v0.5-apetresc"
+depends=('bash' 'java-runtime' 'leela-zero')
+makedepends=('git' 'maven' 'curl')
+source=("https://github.com/featurecat/lizzie/archive/${pkgver}.tar.gz"
+        'winrate.patch::https://github.com/featurecat/lizzie/commit/d50f73a2cfb14b8f79c315f4057de8350bd5cfe5.patch'
+        'lizzie.sh'
         'lizzie.desktop')
-md5sums=('SKIP'
-         '1fefb91214fd8fd2f1241de2b73f8701')
+sha256sums=('0bc244914d80d7fecab1ef22e6ad2a540992019734e4081138bb9cf757bc79cd'
+            'babc24f1bdd9e5c6315aff72eb6881489ec6ea0cae8bf277285a019c918dd665'
+            '58a4987ab4167aab557e1bcd2bb22daec252ce7c6397e76040c038516b74de70'
+            'cf5d1651023f04294e580243aa7ef05bc9ebedb468631f4035fd3d5ce0f212f0')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # Use leela-zero-git's weights file instead of downloading a new one just for `mvn test`
+  ln -sf /usr/share/leela-zero/networks/weights.txt network.gz
+
+  # Necessary bug fix to pass tests
+  patch -Np1 -i "$srcdir/winrate.patch"
+}
 
 build() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
 
   mvn package
 }
 
 check() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
 
   mvn test
 }
 
 package() {
-  cd $srcdir/$pkgname
+  sed -i 's/network.gz/\/usr\/share\/leela-zero\/networks\/weights.txt/g' "$pkgname"-"$pkgver"/config.txt
 
-  install -Dm644 ${srcdir}/${pkgname}/target/lizzie-${pkgver}-shaded.jar ${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 "$pkgname-$pkgver"/target/lizzie-"$pkgver"-shaded.jar "$pkgdir"/usr/share/java/"$pkgname"/"$pkgname".jar
+  install -Dm644 "$pkgname-$pkgver"/config.txt "$pkgdir"/usr/share/"$pkgname"/config.txt
+  install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/"$pkgname"
+  install -Dm644 "$pkgname".desktop "$pkgdir"/usr/share/applications/"$pkgname".desktop
 }
diff --git a/lizzie.desktop b/lizzie.desktop
index 22a1041eee46..0039e251dc44 100644
--- a/lizzie.desktop
+++ b/lizzie.desktop
@@ -2,7 +2,7 @@
 Name=Lizzie
 GenericName=SGF Editor (Go)
 Comment=A GUI for Leela-Zero
-Exec=/usr/bin/java -jar /usr/share/java/lizzie/lizzie.jar %U
+Exec=/usr/bin/lizzie %U
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/lizzie.sh b/lizzie.sh
new file mode 100644
index 000000000000..cafe41532a52
--- /dev/null
+++ b/lizzie.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ ! -d "$HOME/.local/share/lizzie" ]; then
+    mkdir -p "$HOME"/.local/share/lizzie
+    cp /usr/share/lizzie/config.txt "$HOME"/.local/share/lizzie
+    if [ -f "$HOME/.local/share/leela-zero/leelaz_opencl_tuning" ]; then
+        ln -s "$HOME"/.local/share/leela-zero/leelaz_opencl_tuning "$HOME"/.local/share/lizzie/leelaz_opencl_tuning
+    fi
+fi
+cd "$HOME"/.local/share/lizzie && java -jar '/usr/share/java/lizzie/lizzie.jar' "$@"
\ No newline at end of file