upgpkg: spigot 1.12.2-1

* Pin version of 'BuildTools.jar' using a Jenkins build tag
* Quote more variables in the PKGBUILD and .install file
* Switch from `echo` to makepkg's internal `msg` and `msg2`
* Add comment honoring the initial submitter of this package
* Remove '.gitignore'

4 files changed, 57 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c73bb9b14631..2cc1ce7b2a96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Aug  4 04:39:13 UTC 2017
 pkgbase = spigot
 	pkgdesc = High performance Minecraft server implementation
-	pkgver = 1.12.1
+	pkgver = 1.12.2
 	pkgrel = 1
 	url = https://www.spigotmc.org/
 	install = spigot.install
@@ -19,26 +17,24 @@ pkgbase = spigot
 	depends = sed
 	optdepends = tar: needed in order to create world backups
 	optdepends = netcat: required in order to suspend an idle server
-	provides = minecraft-server=1.12.1
-	provides = bukkit=1.12.1
-	provides = craftbukkit=1.12.1
+	provides = minecraft-server=1.12.2
+	provides = bukkit=1.12.2
+	provides = craftbukkit=1.12.2
 	conflicts = bukkit
 	conflicts = craftbukkit
 	conflicts = spigot-patcher
-	noextract = BuildTools.jar
 	backup = etc/conf.d/spigot
-	source = https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+	source = BuildTools-1.12.2-68.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/68/artifact/target/BuildTools.jar
 	source = spigot-backup.service
 	source = spigot-backup.timer
 	source = spigot.service
 	source = spigot.conf
 	source = spigot.sh
-	md5sums = SKIP
-	md5sums = 7bb2dc610c5f55e133bd41ab608ec7a1
-	md5sums = 872d2e03799f1f8f0c75acdebce91894
-	md5sums = 1eb2d5f485cf9eff7a99c826ad56fcf4
-	md5sums = b377759fa023d1119893dacff3b01cec
-	md5sums = bb5389bb949e6913ab62141f3cce24cb
+	sha512sums = cc5049bf3388a11f7bb1eb018099b63740f8a742c89cc732723c37e4749a958f5f19d8da952fe937f2e4c54591df18e85054fa6c5c901e451d75bfd7b76056cd
+	sha512sums = 914d079718bcf4adbe60ec1414ae95220be9e0ba6da8135d13fc9f1f82c7a5f1fb1844764a9d827bb9583bee2f6c10111880d0bcba135ec61d63b53a3f2aab27
+	sha512sums = 76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c
+	sha512sums = bfebbb163fe81dbf086f1511c60953c5ef4149e69c80e6a01af35ea67279e2c652072c9342a71e5d1c178a5504fc9d0275c19f51aacb65b722654c5c42a9b1cb
+	sha512sums = 33f456fd945bb2cfa6b390ce0ab02753cc6366e39abff80a4f2b7aa3aebe3cd31d148b785cbc2aa159dd8ad9fb03233a09f8693eb031b6b9db8dc03643d2397b
+	sha512sums = f60f79121b9fd2b5bd117b539f5455b348ee9a5b5c16712ad71b362b8efff3e748c00df4d42135cdce9192cb35d0d9588d0fc5d0e28e6d493df076257586d164
 
 pkgname = spigot
-
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 087643cfebba..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-pkg/
-src/
-*.jar
-*.log
-*.tar
-*.xz
diff --git a/PKGBUILD b/PKGBUILD
index 8aa55f17b1c6..a21f7dcc7cea 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,60 @@
-# Maintainer: Gordian Edenhofer <gordian.edenhofer[at]yahoo[dot]de>
+# Maintainer: Gordian Edenhofer <gordian.edenhofer@gmail.com>
+# Submitter: Schala Zeal <schalaalexiazeal@gmail.com>
+
 pkgname=spigot
-pkgver=1.12.1
+pkgver=1.12.2
+_build=68
 pkgrel=1
 pkgdesc="High performance Minecraft server implementation"
-arch=(any)
+arch=('any')
 url="https://www.spigotmc.org/"
 license=("LGPL")
-depends=("java-runtime-headless>=8" screen sudo fontconfig bash awk sed)
+depends=("java-runtime-headless>=8" 'screen' 'sudo' 'fontconfig' 'bash' 'awk' 'sed')
 optdepends=("tar: needed in order to create world backups"
-"netcat: required in order to suspend an idle server")
-makedepends=("java-environment>=8" git)
+	"netcat: required in order to suspend an idle server")
+makedepends=("java-environment>=8" 'git')
 provides=("minecraft-server=${pkgver%_*}" "bukkit=${pkgver%_*}" "craftbukkit=${pkgver%_*}")
-conflicts=(bukkit craftbukkit spigot-patcher)
+conflicts=("bukkit" "craftbukkit" "spigot-patcher")
 backup=("etc/conf.d/${pkgname}")
 install="${pkgname}.install"
-source=("https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
-"${pkgname}-backup.service"
-"${pkgname}-backup.timer"
-"${pkgname}.service"
-"${pkgname}.conf"
-"${pkgname}.sh")
-noextract=("BuildTools.jar")
-md5sums=('SKIP'
-         '7bb2dc610c5f55e133bd41ab608ec7a1'
-         '872d2e03799f1f8f0c75acdebce91894'
-         '1eb2d5f485cf9eff7a99c826ad56fcf4'
-         'b377759fa023d1119893dacff3b01cec'
-         'bb5389bb949e6913ab62141f3cce24cb')
+source=("BuildTools-${pkgver}-${_build}.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/${_build}/artifact/target/BuildTools.jar"
+	"${pkgname}-backup.service"
+	"${pkgname}-backup.timer"
+	"${pkgname}.service"
+	"${pkgname}.conf"
+	"${pkgname}.sh")
+sha512sums=('cc5049bf3388a11f7bb1eb018099b63740f8a742c89cc732723c37e4749a958f5f19d8da952fe937f2e4c54591df18e85054fa6c5c901e451d75bfd7b76056cd'
+            '914d079718bcf4adbe60ec1414ae95220be9e0ba6da8135d13fc9f1f82c7a5f1fb1844764a9d827bb9583bee2f6c10111880d0bcba135ec61d63b53a3f2aab27'
+            '76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c'
+            'bfebbb163fe81dbf086f1511c60953c5ef4149e69c80e6a01af35ea67279e2c652072c9342a71e5d1c178a5504fc9d0275c19f51aacb65b722654c5c42a9b1cb'
+            '33f456fd945bb2cfa6b390ce0ab02753cc6366e39abff80a4f2b7aa3aebe3cd31d148b785cbc2aa159dd8ad9fb03233a09f8693eb031b6b9db8dc03643d2397b'
+            'f60f79121b9fd2b5bd117b539f5455b348ee9a5b5c16712ad71b362b8efff3e748c00df4d42135cdce9192cb35d0d9588d0fc5d0e28e6d493df076257586d164')
 
 _game="spigot"
 _server_root="/srv/craftbukkit"
 
 build() {
 	export MAVEN_OPTS="-Xmx2g"
-	java -jar BuildTools.jar --rev ${pkgver}
+	java -jar "BuildTools-${pkgver}-${_build}.jar" --rev "${pkgver}"
 }
 
 package() {
-	install -Dm644 ${_game}.conf              "${pkgdir}/etc/conf.d/${_game}"
-	install -Dm755 ${_game}.sh                "${pkgdir}/usr/bin/${_game}"
-	install -Dm644 ${_game}.service           "${pkgdir}/usr/lib/systemd/system/${_game}.service"
-	install -Dm644 ${_game}-backup.service    "${pkgdir}/usr/lib/systemd/system/${_game}-backup.service"
-	install -Dm644 ${_game}-backup.timer      "${pkgdir}/usr/lib/systemd/system/${_game}-backup.timer"
-	install -Dm644 ${_game}-${pkgver}.jar     "${pkgdir}${_server_root}/${_game}.${pkgver}.jar"
+	install -Dm644 "${_game}.conf" "${pkgdir}/etc/conf.d/${_game}"
+	install -Dm755 "${_game}.sh" "${pkgdir}/usr/bin/${_game}"
+	install -Dm644 "${_game}.service" "${pkgdir}/usr/lib/systemd/system/${_game}.service"
+	install -Dm644 "${_game}-backup.service" "${pkgdir}/usr/lib/systemd/system/${_game}-backup.service"
+	install -Dm644 "${_game}-backup.timer" "${pkgdir}/usr/lib/systemd/system/${_game}-backup.timer"
+	install -Dm644 "${_game}-${pkgver}.jar" "${pkgdir}${_server_root}/${_game}.${pkgver}.jar"
 	ln -s "${_game}.${pkgver}.jar" "${pkgdir}${_server_root}/${_game}.jar"
 
 	# Link the log files
 	mkdir -p "${pkgdir}/var/log/"
+	install -dm775 "${pkgdir}/${_server_root}/logs"
 	ln -s "${_server_root}/logs" "${pkgdir}/var/log/${_game}"
 
 	# Give the group write permissions and set user or group ID on execution
 	chmod g+ws "${pkgdir}${_server_root}"
-	
+
 	# Make plugins folder ready for drag and drop
 	install -dm777 "${pkgdir}/${_server_root}/plugins"
 }
diff --git a/spigot.install b/spigot.install
index 33bac679c1f6..abfc184503c0 100755
--- a/spigot.install
+++ b/spigot.install
@@ -3,34 +3,31 @@ _user="craftbukkit"
 _server_root="/srv/craftbukkit"
 
 post_install() {
-	getent group "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo -e "\e[34;1m==>\e[39;1m Adding ${_user} system group... \e[0m"
-		groupadd -r ${_user} 1>/dev/null
+	if ! getent group "${_user}" &>/dev/null; then
+		msg "Adding ${_user} system group..."
+		groupadd -r "${_user}" 1>/dev/null
 	fi
 
-	getent passwd "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo -e "\e[34;1m==>\e[39;1m Adding ${_user} system user... \e[0m"
-		useradd -r -g ${_user} -d "${_server_root}" ${_user} 1>/dev/null
+	if ! getent passwd "${_user}" &>/dev/null; then
+		msg "Adding ${_user} system user..."
+		useradd -r -g "${_user}" -d "${_server_root}" "${_user}" 1>/dev/null
 	fi
 
-	chown -R ${_user}:${_user} "${_server_root}"
+	chown -R "${_user}":"${_user}" "${_server_root}"
 
-	echo -e "\e[34;1m==>\e[39;1m NOTE: The world data is stored under ${_server_root} and the server runs \e[0m"
-	echo -e "\e[34;1m==>\e[39;1m as ${_user} user to increase security. \e[0m"
-	echo -e "\e[34;1m==>\e[39;1m NOTE: Use the ${_game} script under /usr/bin/${_game} to start, stop or backup the server \e[0m"
-	echo -e "\e[34;1m==>\e[39;1m and the configuration file under /etc/conf.d/${_game} to adjust it to your liking. \e[0m"
-	echo -e "\e[34;1m==>\e[39;1m NOTE: For the server to start you have to accept the EULA in ${_server_root}/eula.txt \e[0m"
-	echo -e "\e[34;1m==>\e[39;1m which is generated after the first server start. \e[0m"
+	msg "The world data is stored under ${_server_root} and the server runs as ${_user} user to increase security."
+	msg "Use the ${_game} script under /usr/bin/${_game} to start, stop or backup the server."
+	msg "Adjust the configuration file under /etc/conf.d/${_game} to your liking."
+	msg "For the server to start you have to accept the EULA in ${_server_root}/eula.txt !"
+	msg2 "The EULA file is generated after the first server start."
 }
 
 post_upgrade() {
-	chown -R ${_user}:${_user} "${_server_root}"
+	chown -R "${_user}":"${_user}" "${_server_root}"
 }
 
 post_remove() {
 	# Notifying the user of kept dirs
-	[[ -d "${_server_root}" ]] && echo -e "\e[34;1m==>\e[39;1m NOTE: Game saves in ${_server_root} were kept on your system.\e[0m"
-	echo -e "\e[34;1m==>\e[39;1m NOTE: The ${_user} user was preserved on your system. \e[0m"
+	[[ -d "${_server_root}" ]] && msg "Game saves in ${_server_root} were kept on your system."
+	msg "The ${_user} user was preserved on your system."
 }