now uses a config file

5 files changed, 57 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf80b4bb637d..efeacc7f813a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spigot
 	pkgdesc = High performance Minecraft server implementation
 	pkgver = 1.8.8
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.spigotmc.org/
 	install = spigot.install
 	arch = any
@@ -16,21 +16,24 @@ pkgbase = spigot
 	optdepends = tar: needed in order to create world backups
 	provides = bukkit
 	provides = craftbukkit=1.8.8
-	provides = minecraft-server
+	provides = minecraft-server=1.8.8
 	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 = spigot-backup.service
 	source = spigot-backup.timer
 	source = spigot.service
+	source = spigot.conf
 	source = spigot.sh
 	md5sums = SKIP
 	md5sums = fd17202ba0bb7796439f0b2f6bc53be4
 	md5sums = 774cd44ed90f6be51d368533cf74d7c2
 	md5sums = 580c470c92d88ae2362250d59bd33b10
-	md5sums = 17fede1d02736e0ee87d0b667cdf1525
+	md5sums = a06bef748f591b59dcafdf4953e2ec9f
+	md5sums = 18a9690381e0e17841f711e9564ddec1
 
 pkgname = spigot
 
diff --git a/PKGBUILD b/PKGBUILD
index c97671fe8d78..328271dddac4 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gordian Edenhofer <gordian.edenhofer[at]yahoo[dot]de>
 pkgname=spigot
 pkgver=1.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="High performance Minecraft server implementation"
 arch=(any)
 url="http://www.spigotmc.org/"
@@ -10,25 +10,29 @@ depends=(java-runtime-headless screen sudo fontconfig bash)
 makedepends=(java-environment git)
 optdepends=("tar: needed in order to create world backups")
 conflicts=(bukkit craftbukkit spigot-patcher)
-provides=(bukkit "craftbukkit=${pkgver%_*}" minecraft-server)
+provides=(bukkit "craftbukkit=${pkgver%_*}" "minecraft-server=${pkgver%_*}")
 install=${pkgname}.install
 source=("https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
         "spigot-backup.service"
         "spigot-backup.timer"
         "spigot.service"
-        "spigot.sh")
+        "${pkgname}.conf"
+        "${pkgname}.sh")
+noextract=("BuildTools.jar")
 md5sums=('SKIP'
          'fd17202ba0bb7796439f0b2f6bc53be4'
          '774cd44ed90f6be51d368533cf74d7c2'
          '580c470c92d88ae2362250d59bd33b10'
-         '17fede1d02736e0ee87d0b667cdf1525')
-noextract=("BuildTools.jar")
+         'a06bef748f591b59dcafdf4953e2ec9f'
+         '18a9690381e0e17841f711e9564ddec1')
+backup=("etc/conf.d/spigot")
 
 build() {
 	export MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=1g"
 	java -jar BuildTools.jar --rev $pkgver
 }
 package() {
+	install -Dm644 spigot.conf              "${pkgdir}/etc/conf.d/spigot"
   install -Dm755 spigot.sh                "${pkgdir}/usr/bin/spigot"
 	install -Dm644 spigot-${pkgver}.jar     "${pkgdir}/srv/spigot/spigot.jar"
 	install -Dm644 spigot.service           "${pkgdir}/usr/lib/systemd/system/spigot.service"
diff --git a/spigot.conf b/spigot.conf
new file mode 100644
index 000000000000..0b71c1b54b1e
--- /dev/null
+++ b/spigot.conf
@@ -0,0 +1,16 @@
+# THIS IS THE CONFIGURATION FILE FOR THE SCRIPT NOT FOR THE ACTUAL SERVER_ROOT
+
+# General parameters
+SERVER_ROOT="/srv/spigot"
+BACKUPPATH="/srv/spigot/backup"
+LOGPATH="/srv/spigot/logs"
+WORLDPATHS="/srv/spigot/world /srv/spigot/world_nether /srv/spigot/world_the_end"
+KEEP_BACKUPS="10"
+MC_USER="craftbukkit"
+MAIN_JAR="spigot.jar"
+SESSION_NAME="spigot"
+
+# System parameters for the minecraft server
+MINHEAP="512M"
+MAXHEAP="1024M"
+THREADS="1"
\ No newline at end of file
diff --git a/spigot.install b/spigot.install
index cfa904e5b1b6..ee0f7dceec7e 100755
--- a/spigot.install
+++ b/spigot.install
@@ -18,7 +18,8 @@ _update() {
 
 	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 spigot script under /usr/bin/spigot to start, stop or backup the server. \e[0m"
+    echo -e "\e[34;1m==>\e[39;1m NOTE: Use the spigot script under /usr/bin/spigot 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/spigot to adjust it to your liking. \e[0m"
 }
 
 post_install() {
@@ -29,12 +30,18 @@ post_upgrade() {
     _update
 }
 
-post_remove() {
+pre_remove() {
+	echo -e "\e[34;1m==>\e[39;1m Stopping and disabling spigot daemon... \e[0m"
 	systemctl stop spigot.service
-	systemctl disable spigot.service
+    systemctl disable spigot.service
+
+	/usr/bin/spigot stop > /dev/null
+}
 
+post_remove() {
+	echo -e "\e[34;1m==>\e[39;1m Removing ${USER} system user and group... \e[0m"
 	if getent passwd ${USER} >/dev/null 2>&1; then
-		userdel ${USER}
+		userdel ${USER} 2>/dev/null
 	fi
 	if getent group ${USER} >/dev/null 2>&1; then
 		groupdel ${USER}
@@ -42,4 +49,5 @@ post_remove() {
 
 	# Notifying the user of kept dirs
     [ -d ${SERVER_ROOT} ] && chown root:root ${SERVER_ROOT} && echo -e "\e[34;1m==>\e[39;1m NOTE: Game saves in ${SERVER_ROOT} were kept on your system.\e[0m"
+    [ -d /etc/conf.d/spigot ] && echo -e "\e[34;1m==>\e[39;1m NOTE: Your configuration file /etc/conf.d/spigot was kept on your system.\e[0m"
 }
diff --git a/spigot.sh b/spigot.sh
index b866774d4f6e..ab6dbf6d4d0b 100755
--- a/spigot.sh
+++ b/spigot.sh
@@ -1,19 +1,21 @@
 #!/bin/bash
 
-# You may use this script for any minecraft server of your choice, just alter those variables
-SERVER_ROOT="/srv/spigot"
-BACKUPPATH="/srv/spigot/backup"
-LOGPATH="/srv/spigot/logs"
-WORLDPATHS="/srv/spigot/world /srv/spigot/world_nether /srv/spigot/world_the_end"
-KEEP_BACKUPS="10"
-MC_USER="craftbukkit"
-MAIN_JAR="spigot.jar"
-SESSION_NAME="spigot"
+source /etc/conf.d/spigot || echo "Could not source /etc/conf.d/spigot"
+
+# You may use this script for any minecraft server of your choice, just alter the config file
+SERVER_ROOT="${SERVER_ROOT:-/srv/spigot}"
+BACKUPPATH="${BACKUPPATH:-/srv/spigot/backup}"
+LOGPATH="${LOGPATH:-/srv/spigot/logs}"
+WORLDPATHS="${WORLDPATHS:-/srv/spigot/world /srv/spigot/world_nether /srv/spigot/world_the_end}"
+KEEP_BACKUPS="${KEEP_BACKUPS:-10}"
+MC_USER="${MC_USER:-craftbukkit}"
+MAIN_JAR="${MAIN_JAR:-spigot.jar}"
+SESSION_NAME="${SESSION_NAME:-spigot}"
 
 # Specify system parameters for the minecraft server
-MINHEAP="512M"
-MAXHEAP="1024M"
-THREADS="1"
+MINHEAP="${MINHEAP:-512M}"
+MAXHEAP="${MAXHEAP:-1024M}"
+THREADS="${THREADS:-1}"
 
 # Check for sudo rigths
 if [ $(sudo whoami) != "root" ]; then