summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoraligator2023-03-21 18:50:11 +0100
committeraligator2023-03-21 18:50:11 +0100
commit47e00cf8f531a9303a6831219a531ee4915d8dac (patch)
tree093a8098db5e15481d3cee846cb7500ab0fd1b74
parentb91f6f49a846dc8f9e296c81b17d701c66d96bec (diff)
downloadaur-47e00cf8f531a9303a6831219a531ee4915d8dac.tar.gz
Use XDG_DATA_HOME for the working directory
-rw-r--r--.SRCINFO2
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD12
3 files changed, 10 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1dc34f37f8fa..3f2ca7e091a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jsettlers-git
pkgdesc = A Remake of "The Settlers III" for Windows, Linux, Mac and Android - forked by paulwedeck
- pkgver = 0.6.0.4.alpha.r1.ga78705865
+ pkgver = 0.6.0.6.alpha.r2.gf7597a2f2
pkgrel = 1
url = https://github.com/paulwedeck/settlers-remake
install = jsettlers-git.install
diff --git a/.gitignore b/.gitignore
index 9ed1da9adfad..1f4dda92dbc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
pkg/
src/
jsettlers/
-jsettlers-git-*.pkg.tar.xz
-gradle-*.zip \ No newline at end of file
+jsettlers-git-*.pkg.tar.*
+gradle-*.zip
diff --git a/PKGBUILD b/PKGBUILD
index 6a61321f831f..e701569bd629 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgrel=1
_pkgname='jsettlers'
pkgname=${_pkgname}'-git'
-pkgver=0.6.0.4.alpha.r1.ga78705865
+pkgver=0.6.0.6.alpha.r2.gf7597a2f2
pkgver() {
cd ${_pkgname}
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -48,7 +48,6 @@ package() {
_progName='JSettlers'
- _workingDir='~/.'${_pkgname}
_mapCreatorName='MapCreator'
_mapCreatorScript=${_pkgname}'-'${_mapCreatorName,,}
@@ -73,17 +72,20 @@ package() {
# create launch-scripts
mkdir -p ${bin}
echo '#!/bin/sh' > ${bin}/${_pkgname}
- echo 'cd '${_workingDir} >> ${bin}/${_pkgname}
+ echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_pkgname}
+ echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_pkgname}
echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_progName}'.jar --maps=/usr/share/'${_pkgname}'/maps "$@"' >> ${bin}/${_pkgname}
chmod +x ${bin}/${_pkgname}
echo '#!/bin/sh' > ${bin}/${_mapCreatorScript}
- echo 'cd '${_workingDir} >> ${bin}/${_mapCreatorScript}
+ echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_mapCreatorScript}
+ echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_mapCreatorScript}
echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_mapCreatorName}'.jar --maps=/usr/share/'${_pkgname}'/maps "$@"' >> ${bin}/${_mapCreatorScript}
chmod +x ${bin}/${_mapCreatorScript}
echo '#!/bin/sh' > ${bin}/${_serverScript}
- echo 'cd '${_workingDir} >> ${bin}/${_serverScript}
+ echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_serverScript}
+ echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_serverScript}
echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_serverJar}' "$@"' >> ${bin}/${_serverScript}
chmod +x ${bin}/${_serverScript}