summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMckol2019-07-12 23:29:25 +0200
committerMckol2019-07-12 23:29:25 +0200
commitc817565e342f356c153f8e2055e630f6014d569e (patch)
treede2c13bded3dd692ce87a1e5d69f5945fcc1e224
parent0a6e213f17add9b579e522f07477161f6f76665a (diff)
downloadaur-c817565e342f356c153f8e2055e630f6014d569e.tar.gz
Added a workaround for launching issues
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD15
-rw-r--r--veloren-voxygen-run9
-rw-r--r--voxygen.desktop3
4 files changed, 24 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f0b2191e18a..936eed6e8b08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,17 +5,20 @@ pkgbase = veloren
url = https://veloren.net/
arch = x86_64
license = GPL3
+ depends = bash
provides = veloren
conflicts = veloren
noextract = voxygen.desktop
noextract = voxygen.png
- options = !strip
+ noextract = veloren-voxygen-run
source = veloren::https://gitlab.com/veloren/veloren/-/jobs/220570217/artifacts/raw/commit-linux-debug.tar.bz2
source = voxygen.desktop
source = voxygen.png
+ source = veloren-voxygen-run
sha512sums = 7c7f5030de97a73d6510d7ed405ac293d027d5cabc70b7a0954734ad764ab2b63b023ead9d27fd3f3e2fdcbb82f3e097d7381324083ae3d2bf6ec9b71f1cde14
- sha512sums = 27e4e25dc7f7f149873da28414b176c19c27d4c8d656a7f2ab11648137d75e2ec7d0ed07066e5384525123eace34debe1417d16f3e86a2b4ccf06f7c77fa052e
+ sha512sums = 52d02514e43022cf9f58981390d8793281145fc262bf0b3145edeead5fa55b98ceba60cbcfe3bbb5e4eb3aede9ddb5b6e39635f1bfa212dd84997e3266c636bc
sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
+ sha512sums = afd77ac09d5855a8b19280035bc50753e19dfaccdece7c1430dce076cb86f8237aa4850ad101baa2caccd1958b99dc1032a33d00d314e99fb19b03e02a0e9eee
pkgname = veloren
diff --git a/PKGBUILD b/PKGBUILD
index f03271687788..9d0d3aadb319 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgdesc="An open-world, open-source multiplayer voxel RPG"
arch=('x86_64')
url="https://veloren.net/"
license=('GPL3')
-options=('!strip')
-depends=()
+options=()
+depends=('bash')
makedepends=()
provides=("$pkgname")
conflicts=("$pkgname")
@@ -16,11 +16,13 @@ source=(
"$pkgname"::"https://gitlab.com/veloren/veloren/-/jobs/220570217/artifacts/raw/commit-linux-debug.tar.bz2"
"voxygen.desktop"
"voxygen.png"
+ "veloren-voxygen-run"
)
-noextract=("voxygen.desktop" "voxygen.png")
+noextract=("voxygen.desktop" "voxygen.png" "veloren-voxygen-run")
sha512sums=('7c7f5030de97a73d6510d7ed405ac293d027d5cabc70b7a0954734ad764ab2b63b023ead9d27fd3f3e2fdcbb82f3e097d7381324083ae3d2bf6ec9b71f1cde14'
- '27e4e25dc7f7f149873da28414b176c19c27d4c8d656a7f2ab11648137d75e2ec7d0ed07066e5384525123eace34debe1417d16f3e86a2b4ccf06f7c77fa052e'
- 'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
+ '52d02514e43022cf9f58981390d8793281145fc262bf0b3145edeead5fa55b98ceba60cbcfe3bbb5e4eb3aede9ddb5b6e39635f1bfa212dd84997e3266c636bc'
+ 'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94'
+ 'afd77ac09d5855a8b19280035bc50753e19dfaccdece7c1430dce076cb86f8237aa4850ad101baa2caccd1958b99dc1032a33d00d314e99fb19b03e02a0e9eee')
package() {
mkdir -p "$pkgdir/usr/share/veloren"
@@ -31,9 +33,10 @@ package() {
chmod +x "$pkgdir/usr/bin/veloren-voxygen"
cp "$srcdir/commit-build/veloren-server-cli" "$pkgdir/usr/bin/"
chmod +x "$pkgdir/usr/bin/veloren-server-cli"
+ cp "$srcdir/veloren-voxygen-run" "$pkgdir/usr/bin/"
mkdir -p "$pkgdir/usr/share/pixmaps"
mkdir -p "$pkgdir/usr/share/applications/veloren"
cp "$srcdir/voxygen.desktop" "$pkgdir/usr/share/applications/veloren/"
cp "$srcdir/voxygen.png" "$pkgdir/usr/share/pixmaps/"
-} \ No newline at end of file
+}
diff --git a/veloren-voxygen-run b/veloren-voxygen-run
new file mode 100644
index 000000000000..c8c6510f452e
--- /dev/null
+++ b/veloren-voxygen-run
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -d ~/.cache/veloren ]; then
+ mkdir -p ~/.cache/veloren
+ ln -sd /usr/share/veloren/assets ~/.cache/veloren/assets
+fi
+
+cd ~/.cache/veloren
+veloren-voxygen \ No newline at end of file
diff --git a/voxygen.desktop b/voxygen.desktop
index 6662d47a9e49..c5b5df70fa8c 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
-Path=/usr/share/veloren/
+Exec=veloren-voxygen-run
Categories=Game
Keywords=veloren
Terminal=true