summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinicius Massuchetto2017-04-16 21:33:23 -0300
committerVinicius Massuchetto2017-04-16 21:33:23 -0300
commit4f74f5a6485b0a94e61d44a99971c90d879b6fee (patch)
treeb6b8b859bb506269a7ed7565828de7ac8cceac2d
parenta187791c5ee6a3e94038f3191634e13ea27c5e5b (diff)
downloadaur-4f74f5a6485b0a94e61d44a99971c90d879b6fee.tar.gz
Executes the default launcher script `Magarena.sh`
The default launcher was updated to support different paths for the jar file and user data. Branch will be merged as soon as this behavior is released in a next version. https://github.com/magarena/magarena/issues/635
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
-rwxr-xr-x[-rw-r--r--]magarena (renamed from magarena.template)3
3 files changed, 6 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da113b723f09..0551911b5b05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = magarena
source = https://github.com/magarena/magarena/releases/download/1.83/Magarena-1.83.zip
source = magarena.png
source = magarena.desktop
- source = magarena.template
+ source = magarena
md5sums = 0243a3e62e59d8654c5542ea572cdc20
md5sums = SKIP
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index dd78b512e05f..f3565b589d48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://magarena.github.io/"
license=("GPLv3")
depends=("java-runtime-common")
source=("https://github.com/magarena/magarena/releases/download/$pkgver/Magarena-$pkgver.zip"
- "magarena.png" "magarena.desktop" "magarena.template")
+ "magarena.png" "magarena.desktop" "magarena")
md5sums=("0243a3e62e59d8654c5542ea572cdc20"
"SKIP" "SKIP" "SKIP")
@@ -17,18 +17,15 @@ package() {
mkdir -p "$pkgdir"/usr/bin/
mkdir -p "$pkgdir"/usr/share/{applications,icons/hicolor/128x128/game,licenses/magarena,magarena}
- JVM=`grep "^exec" "$srcdir/Magarena-$pkgver/Magarena.sh" | sed 's/Magarena.jar//g'`
- sed "s/^JVM/$JVM/g" magarena.template > "$pkgdir"/usr/bin/magarena
-
+ install -Dm755 magarena "$pkgdir"/usr/bin/
install -Dm644 magarena.png "$pkgdir"/usr/share/icons/hicolor/128x128/game/
install -Dm644 magarena.desktop "$pkgdir"/usr/share/applications/
cd "$srcdir/Magarena-$pkgver/"
install -Dm644 Magarena.jar "$pkgdir"/usr/share/magarena/
- cp -rf lib "$pkgdir"/usr/share/magarena/
+ install -Dm755 Magarena.sh "$pkgdir"/usr/share/magarena/
+ cp -rf lib "$pkgdir"/usr/share/magarena/
tar -cvzf "$pkgdir"/usr/share/magarena/default-userdata.tar.gz Magarena
-
chmod 755 "$pkgdir"/usr/share/magarena
- chmod 755 "$pkgdir"/usr/bin/magarena
}
diff --git a/magarena.template b/magarena
index 93ed4d9f5b86..396bd333bbc6 100644..100755
--- a/magarena.template
+++ b/magarena
@@ -3,5 +3,4 @@ if [ ! -d $HOME/.magarena/Magarena ] ; then
mkdir -p $HOME/.magarena
tar -xvzf /usr/share/magarena/default-userdata.tar.gz -C $HOME/.magarena/
fi
-cd $HOME/.magarena
-JVM /usr/share/magarena/Magarena.jar
+/usr/share/magarena/Magarena.sh /usr/share/magarena/Magarena.jar $HOME/.magarena