summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Choffet2017-03-12 13:46:55 -0400
committerPierre Choffet2017-03-12 13:46:55 -0400
commit72172813a93ef7a3c95f72f1e8d3cb520fdf4d49 (patch)
tree32bb4baed10d17ba94933f1a99929f9d2ba64671
parent00e209e772bdf32aad66ec61511a8edbaad72460 (diff)
downloadaur-72172813a93ef7a3c95f72f1e8d3cb520fdf4d49.tar.gz
Fix copy of rttr.sh
-rw-r--r--.SRCINFO4
-rw-r--r--ChangeLog4
-rw-r--r--PKGBUILD18
3 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa28e958eea6..f9d091c7c66a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Mar 11 02:39:47 UTC 2017
+# Sun Mar 12 17:46:24 UTC 2017
pkgbase = return-to-the-roots
pkgdesc = Free/libre implementation of The Settlers II game engine
pkgver = 0.8.1.r3017.bf9fcc60
- pkgrel = 3
+ pkgrel = 4
url = https://siedler25.org/
install = return-to-the-roots.install
changelog = ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 665759f321a5..762c75729ce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-12 Pierre Choffet <peuc@wanadoo.fr>
+ * 0.8.1.r3017.bf9fcc60-4 :
+ Fix copy of rttr.sh launch script
+
2017-03-10 Pierre Choffet <peuc@wanadoo.fr>
* 0.8.1.r3017.bf9fcc60-3 :
Fix package install on x86_64 systems
diff --git a/PKGBUILD b/PKGBUILD
index bcd8edd1347d..ee9758c09721 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=return-to-the-roots
pkgver=0.8.1.r3017.bf9fcc60
-pkgrel=3
+pkgrel=4
pkgdesc="Free/libre implementation of The Settlers II game engine"
arch=("i686" "x86_64")
url="https://siedler25.org/"
@@ -30,7 +30,7 @@ prepare() {
build() {
cd "s25client/build/"
- ./cmake.sh --prefix="$pkgdir/usr" --RTTR_BINDIR="bin" --RTTR_DATADIR="share/s25rttr" --RTTR_LIBDIR="lib/s25rttr"
+ ./cmake.sh --prefix="${pkgdir}/usr" --RTTR_BINDIR="bin" --RTTR_DATADIR="share/s25rttr" --RTTR_LIBDIR="lib/s25rttr"
make
}
@@ -41,18 +41,18 @@ package() {
make install
# Copy launch script
- mv "$srcdir/rttr.sh" "$pkgdir/usr/bin/"
+ install -Dm755 "${srcdir}/rttr.sh" "${pkgdir}/usr/bin"
# Get additional files
- mkdir -p $pkgdir/usr/share/applications
- cp "$srcdir/s25client/debian/s25rttr.desktop" "$pkgdir/usr/share/applications/"
+ mkdir -p ${pkgdir}/usr/share/applications
+ cp "${srcdir}/s25client/debian/s25rttr.desktop" "${pkgdir}/usr/share/applications/"
- mkdir -p $pkgdir/usr/share/pixmaps
- cp "$srcdir/s25client/debian/s25rttr.png" "$pkgdir/usr/share/pixmaps/"
+ mkdir -p ${pkgdir}/usr/share/pixmaps
+ cp "${srcdir}/s25client/debian/s25rttr.png" "${pkgdir}/usr/share/pixmaps/"
# Fix usr/lib directory on x86_64
- if [ -d "$pkgdir/usr/lib64" ]
+ if [ -d "${pkgdir}/usr/lib64" ]
then
- mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
+ mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
fi
}