summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBuildTools2015-11-20 13:16:13 -0800
committerBuildTools2015-11-20 13:16:13 -0800
commit242523469d89c1b6a075728ec8526656fd742d41 (patch)
tree51d4f373d1b3dad01d543f32b42519a042b5fcd7
parent0958fc8e26c281511308b5aeac734663ed7357cc (diff)
downloadaur-242523469d89c1b6a075728ec8526656fd742d41.tar.gz
Restored compatibility with craftbukkit plugins
-rw-r--r--.SRCINFO6
-rwxr-xr-xPKGBUILD8
-rw-r--r--spigot.conf8
-rwxr-xr-xspigot.install2
-rwxr-xr-xspigot.sh8
5 files changed, 16 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23b921fae1d..568aefb7f09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = spigot
pkgdesc = High performance Minecraft server implementation
pkgver = 1.8.8
- pkgrel = 4
+ pkgrel = 5
url = http://www.spigotmc.org/
install = spigot.install
arch = any
@@ -32,8 +32,8 @@ pkgbase = spigot
md5sums = fd17202ba0bb7796439f0b2f6bc53be4
md5sums = 774cd44ed90f6be51d368533cf74d7c2
md5sums = 580c470c92d88ae2362250d59bd33b10
- md5sums = abdc0e0fd9528bd5ae4155f45f67c857
- md5sums = 4d14e748e8769ecbe8c784297c39ab33
+ md5sums = 12a49f9b4ba6e5f4887555af0947949b
+ md5sums = 528b26d2326fe92d96d29d8b615c9d6d
pkgname = spigot
diff --git a/PKGBUILD b/PKGBUILD
index 179222cc62a..9731276a3ce 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=4
+pkgrel=5
pkgdesc="High performance Minecraft server implementation"
arch=(any)
url="http://www.spigotmc.org/"
@@ -23,8 +23,8 @@ md5sums=('SKIP'
'fd17202ba0bb7796439f0b2f6bc53be4'
'774cd44ed90f6be51d368533cf74d7c2'
'580c470c92d88ae2362250d59bd33b10'
- 'abdc0e0fd9528bd5ae4155f45f67c857'
- '4d14e748e8769ecbe8c784297c39ab33')
+ '12a49f9b4ba6e5f4887555af0947949b'
+ '528b26d2326fe92d96d29d8b615c9d6d')
backup=("etc/conf.d/${pkgname}")
build() {
@@ -34,7 +34,7 @@ build() {
package() {
install -Dm644 ${pkgname}.conf "${pkgdir}/etc/conf.d/${pkgname}"
install -Dm755 ${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
- install -Dm644 ${pkgname}-${pkgver}.jar "${pkgdir}/srv/${pkgname}/${pkgname}.jar"
+ install -Dm644 ${pkgname}-${pkgver}.jar "${pkgdir}/srv/craftbukkit/${pkgname}.jar"
install -Dm644 ${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
install -Dm644 ${pkgname}-backup.service "${pkgdir}/usr/lib/systemd/system/${pkgname}-backup.service"
install -Dm644 ${pkgname}-backup.timer "${pkgdir}/usr/lib/systemd/system/${pkgname}-backup.timer"
diff --git a/spigot.conf b/spigot.conf
index 6cf0576f7d6..3796f3324f2 100644
--- a/spigot.conf
+++ b/spigot.conf
@@ -1,10 +1,10 @@
# THIS IS THE CONFIGURATION FILE FOR THE SCRIPT NOT FOR THE ACTUAL SERVER
# 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"
+SERVER_ROOT="/srv/craftbukkit"
+BACKUPPATH="/srv/craftbukkit/backup"
+LOGPATH="/srv/craftbukkit/logs"
+WORLDPATHS="/srv/craftbukkit/world /srv/craftbukkit/world_nether /srv/craftbukkit/world_the_end"
KEEP_BACKUPS="10"
MC_USER="craftbukkit"
MAIN_JAR="spigot.jar"
diff --git a/spigot.install b/spigot.install
index 0f5b9b035b2..ea9aaf50127 100755
--- a/spigot.install
+++ b/spigot.install
@@ -1,5 +1,5 @@
USER="craftbukkit"
-SERVER_ROOT="/srv/spigot"
+SERVER_ROOT="/srv/craftbukkit"
_update() {
getent group "${USER}" &>/dev/null
diff --git a/spigot.sh b/spigot.sh
index b56027e5037..2907ac563be 100755
--- a/spigot.sh
+++ b/spigot.sh
@@ -3,10 +3,10 @@
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}"
+SERVER_ROOT="${SERVER_ROOT:-/srv/craftbukkit}"
+BACKUPPATH="${BACKUPPATH:-/srv/craftbukkit/backup}"
+LOGPATH="${LOGPATH:-/srv/craftbukkit/logs}"
+WORLDPATHS="${WORLDPATHS:-/srv/craftbukkit/world /srv/craftbukkit/world_nether /srv/craftbukkit/world_the_end}"
KEEP_BACKUPS="${KEEP_BACKUPS:-10}"
MC_USER="${MC_USER:-craftbukkit}"
MAIN_JAR="${MAIN_JAR:-spigot.jar}"