summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik “Freso” S. Olesen2019-04-11 22:58:24 +0200
committerFrederik “Freso” S. Olesen2019-04-11 22:58:24 +0200
commitb1876fb3066daaeccb2c35d89a308cdbb7c700de (patch)
tree553249e8a53a05b699baf0793e9c6905c9f8ec3a
parent5a7860382dd0a1454859438c869795578a516527 (diff)
parentaacc6e6f24ba2f83cca347ed7ad79ce6771283b6 (diff)
downloadaur-b1876fb3066daaeccb2c35d89a308cdbb7c700de.tar.gz
Merge changes from/updates to 'amidst' PKGBUILD
-rw-r--r--.SRCINFO2
-rw-r--r--ChangeLog8
-rw-r--r--PKGBUILD20
3 files changed, 20 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2281949b62..38cf4d4997b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = amidstexporter
pkgdesc = Advanced Minecraft Interface and Data/Structure Tracking; fork with location export.
pkgver = 1.44
- pkgrel = 1
+ pkgrel = 2
url = http://www.buildingwithblocks.info/exportfromseed.html
changelog = ChangeLog
arch = any
diff --git a/ChangeLog b/ChangeLog
index 4e4c791eb55..f8e8b5d9ac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-04-11 Frederik “Freso” S. Olesen <freso.dk@gmail.com>
+
+ * 1.44-2 :
+ Copy various changes from amidst PKGBUILD:
+ Install program icon(s) as per freedesktop.org’s Icon Theme Specification.
+ Quit/un‐verbose various command outputs.
+ Refactor how the PKGBUILD installs icons.
+
2016-10-20 Frederik “Freso” S. Olesen <freso.dk@gmail.com>
* 1.44-1 :
diff --git a/PKGBUILD b/PKGBUILD
index cc5eea06996..a399a7dc433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
# Maintainer: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
+# Contributor: CubeTheThird <cubethethird@gmail.com>
pkgname=amidstexporter
pkgver='1.44'
_jarfile='AmidstExporter.jar'
-pkgrel=1
+pkgrel=2
pkgdesc='Advanced Minecraft Interface and Data/Structure Tracking; fork with location export.'
arch=('any')
license=('GPL3')
@@ -23,19 +24,20 @@ prepare() {
cd "$srcdir"
# Extract icon
- bsdcpio --extract --make-directories --insecure 'amidst/resources/icon16.png' 'amidst/resources/icon32.png' 'amidst/resources/icon64.png' < "$_jarfile"
+ bsdcpio --quiet --extract --make-directories --insecure 'amidst/resources/icon*.png' < "$_jarfile"
}
package() {
cd "$srcdir"
- install -vDm755 'amidstexporter.sh' "$pkgdir/usr/bin/amidstexporter"
- install -vDm644 'amidst/resources/icon16.png' "$pkgdir/usr/share/pixmaps/amidstexporter-16.png"
- install -vDm644 'amidst/resources/icon32.png' "$pkgdir/usr/share/pixmaps/amidstexporter-32.png"
- install -vDm644 'amidst/resources/icon64.png' "$pkgdir/usr/share/pixmaps/amidstexporter-64.png"
- ln -s ./amidstexporter-64.png "$pkgdir/usr/share/pixmaps/amidstexporter.png"
- install -vDm644 'amidstexporter.desktop' "$pkgdir/usr/share/applications/amidstexporter.desktop"
- install -vDm644 "$_jarfile" "$pkgdir/usr/share/java/$pkgname/$_jarfile"
+ install -Dm755 'amidstexporter.sh' "$pkgdir/usr/bin/amidstexporter"
+ install -Dm644 'amidstexporter.desktop' "$pkgdir/usr/share/applications/amidstexporter.desktop"
+ install -Dm644 "$_jarfile" "$pkgdir/usr/share/java/$pkgname/$_jarfile"
+
+ icon_sizes=(16 32 64)
+ for s in "${icon_sizes[@]}"; do
+ install -Dm644 "amidst/resources/icon${s}.png" "$pkgdir/usr/share/icons/hicolor/${s}x${s}/apps/amidstexporter.png"
+ done
}
# vim:set ts=4 sw=4 et: