Updated to 0.3

4 files changed, 14 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a9c03c7ed9f..d26f0307fe78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = veloren
 	pkgdesc = An open-world, open-source multiplayer voxel RPG
-	pkgver = 0.2.0
+	pkgver = 0.3.0
 	pkgrel = 1
 	url = https://veloren.net/
 	arch = x86_64
@@ -11,14 +11,12 @@ pkgbase = veloren
 	noextract = voxygen.desktop
 	noextract = voxygen.png
 	noextract = veloren-voxygen-run
-	source = veloren::https://gitlab.com/veloren/veloren/-/jobs/220570217/artifacts/raw/commit-linux-debug.tar.bz2
+	source = veloren::https://gitlab.com/veloren/veloren/-/jobs/265513558/artifacts/raw/optional-release-linux-debug.tar.bz2
 	source = voxygen.desktop
 	source = voxygen.png
-	source = veloren-voxygen-run
-	sha512sums = 7c7f5030de97a73d6510d7ed405ac293d027d5cabc70b7a0954734ad764ab2b63b023ead9d27fd3f3e2fdcbb82f3e097d7381324083ae3d2bf6ec9b71f1cde14
-	sha512sums = 52d02514e43022cf9f58981390d8793281145fc262bf0b3145edeead5fa55b98ceba60cbcfe3bbb5e4eb3aede9ddb5b6e39635f1bfa212dd84997e3266c636bc
+	sha512sums = c124e02e11a86209328c171dfbf7e292d62ea75e8d7afd06b18755ffd58807d5cc1dc36654948fc604c64f5ef88db4773dd43d27cb5ea2659fd447ae5475eaed
+	sha512sums = 88f067450ada7cd774435b196319d820d99f60e9f0c0561b6ae99191b969b00e2573d47445327e3a4d0bf733dd937d5f804f91f5ce7001f79077a8a8e4f9757d
 	sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
-	sha512sums = 93ca6ee4b6b6e4f6760fc6529e78d98fe5c2b409c69f49fe1b242dcfb53e16e411e94815b89d7c9d764fc5d2e3e5d31a7fdb573febfb0c871e0ce44074184ac3
 
 pkgname = veloren
 
diff --git a/PKGBUILD b/PKGBUILD
index 6daab4551c13..9377e243f6ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mckol <mckol363@gmail.com>
 
 pkgname=veloren
-pkgver=0.2.0
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="An open-world, open-source multiplayer voxel RPG"
 arch=('x86_64')
@@ -13,25 +13,23 @@ makedepends=()
 provides=("$pkgname")
 conflicts=("$pkgname")
 source=(
-    "$pkgname"::"https://gitlab.com/veloren/veloren/-/jobs/220570217/artifacts/raw/commit-linux-debug.tar.bz2"
+    "$pkgname"::"https://gitlab.com/veloren/veloren/-/jobs/265513558/artifacts/raw/optional-release-linux-debug.tar.bz2"
     "voxygen.desktop"
     "voxygen.png"
-    "veloren-voxygen-run"
 )
 noextract=("voxygen.desktop" "voxygen.png" "veloren-voxygen-run")
-sha512sums=('7c7f5030de97a73d6510d7ed405ac293d027d5cabc70b7a0954734ad764ab2b63b023ead9d27fd3f3e2fdcbb82f3e097d7381324083ae3d2bf6ec9b71f1cde14'
-            '52d02514e43022cf9f58981390d8793281145fc262bf0b3145edeead5fa55b98ceba60cbcfe3bbb5e4eb3aede9ddb5b6e39635f1bfa212dd84997e3266c636bc'
-            'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94'
-            '93ca6ee4b6b6e4f6760fc6529e78d98fe5c2b409c69f49fe1b242dcfb53e16e411e94815b89d7c9d764fc5d2e3e5d31a7fdb573febfb0c871e0ce44074184ac3')
+sha512sums=('c124e02e11a86209328c171dfbf7e292d62ea75e8d7afd06b18755ffd58807d5cc1dc36654948fc604c64f5ef88db4773dd43d27cb5ea2659fd447ae5475eaed'
+            '88f067450ada7cd774435b196319d820d99f60e9f0c0561b6ae99191b969b00e2573d47445327e3a4d0bf733dd937d5f804f91f5ce7001f79077a8a8e4f9757d'
+            'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
 
 package() {
     mkdir -p "$pkgdir/usr/share/veloren"
     mkdir -p "$pkgdir/usr/bin"
-    cp -r "$srcdir/commit-build/assets" "$pkgdir/usr/share/veloren/"
-    cp -r "$srcdir/commit-build/shaders" "$pkgdir/usr/share/veloren/"
-    cp "$srcdir/commit-build/veloren-voxygen" "$pkgdir/usr/bin/"
+    cp -r "$srcdir/optional-release-build/assets" "$pkgdir/usr/share/veloren/"
+    cp -r "$srcdir/optional-release-build/shaders" "$pkgdir/usr/share/veloren/"
+    cp "$srcdir/optional-release-build/veloren-voxygen" "$pkgdir/usr/bin/"
     chmod +x "$pkgdir/usr/bin/veloren-voxygen"
-    cp "$srcdir/commit-build/veloren-server-cli" "$pkgdir/usr/bin/"
+    cp "$srcdir/optional-release-build/veloren-server-cli" "$pkgdir/usr/bin/"
     chmod +x "$pkgdir/usr/bin/veloren-server-cli"
     cp "$srcdir/veloren-voxygen-run" "$pkgdir/usr/bin/"
     chmod +x "$pkgdir/usr/bin/veloren-voxygen-run"
diff --git a/veloren-voxygen-run b/veloren-voxygen-run
deleted file mode 100644
index d8fd215eeeca..000000000000
--- a/veloren-voxygen-run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "$HOME/.cache/veloren" ]; then
-    mkdir -p "$HOME/.cache/veloren"
-    ln -sd "/usr/share/veloren/assets" "$HOME/.cache/veloren/assets"
-fi
-
-cd "$HOME/.cache/veloren"
-veloren-voxygen
\ No newline at end of file
diff --git a/voxygen.desktop b/voxygen.desktop
index c5b5df70fa8c..7a403eb5217c 100644
--- a/voxygen.desktop
+++ b/voxygen.desktop
@@ -3,8 +3,7 @@ Version=1.2
 Type=Application
 Name=Voxygen
 Comment=Official Veloren Client
-Exec=veloren-voxygen-run
+Exec=veloren-voxygen
 Categories=Game
 Keywords=veloren
-Terminal=true
 Icon=voxygen.png