diff options
author | Nitroretro | 2019-09-19 21:21:52 +0300 |
---|---|---|
committer | Nitroretro | 2019-09-19 21:21:52 +0300 |
commit | aa39a9cc5d015d422464836980dee4eba5331f75 (patch) | |
tree | 2af09407cee6767afd17bf94a22515482357ed14 | |
parent | 477ba9fe886ed1be76a279d15ed857434fda8b54 (diff) | |
download | aur-aa39a9cc5d015d422464836980dee4eba5331f75.tar.gz |
Make forge-server-1.11.2 work with Forge 1.10.2
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | .gitignore | 12 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | forge-1.10.2d-backup.service (renamed from forge-1.11.2d-backup.service) | 6 | ||||
-rw-r--r-- | forge-1.10.2d-backup.timer (renamed from forge-1.11.2d-backup.timer) | 0 | ||||
-rw-r--r-- | forge-1.10.2d.conf (renamed from forge-1.11.2d.conf) | 10 | ||||
-rw-r--r-- | forge-1.10.2d.service (renamed from forge-1.11.2d.service) | 8 | ||||
-rwxr-xr-x | forge-1.10.2d.sh (renamed from forge-1.11.2d.sh) | 8 | ||||
-rw-r--r-- | forge-server-1.10.2.install (renamed from forge-server-1.11.2.install) | 6 |
9 files changed, 56 insertions, 54 deletions
@@ -1,9 +1,9 @@ -pkgbase = forge-server-1.11.2 +pkgbase = forge-server-1.10.2 pkgdesc = Minecraft Forge server unit files, script, and jar - pkgver = 1.11.2_13.20.1.2386 - pkgrel = 2 + pkgver = 1.10.2_12.18.3.2185 + pkgrel = 1 url = https://minecraftforge.net/ - install = forge-server-1.11.2.install + install = forge-server-1.10.2.install arch = any license = custom depends = java-runtime-headless=8 @@ -14,24 +14,24 @@ pkgbase = forge-server-1.11.2 depends = sed optdepends = tar: needed in order to create world backups optdepends = netcat: required in order to suspend an idle server - noextract = forge-1.11.2-1.11.2-13.20.1.2386-installer.jar - backup = etc/conf.d/forge-1.11.2 - source = forge-1.11.2-1.11.2-13.20.1.2386-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2386/forge-1.11.2-13.20.1.2386-installer.jar - source = forge-1.11.2d-backup.service - source = forge-1.11.2d-backup.timer - source = forge-1.11.2d.service - source = forge-1.11.2d.conf - source = forge-1.11.2d.sh + noextract = forge-1.10.2-1.10.2-12.18.3.2185-installer.jar + backup = etc/conf.d/forge-1.10.2 + source = forge-1.10.2-1.10.2-12.18.3.2185-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10.2-12.18.3.2185/forge-1.10.2-12.18.3.2185-installer.jar + source = forge-1.10.2d-backup.service + source = forge-1.10.2d-backup.timer + source = forge-1.10.2d.service + source = forge-1.10.2d.conf + source = forge-1.10.2d.sh source = LICENSE-fml.txt source = LICENSE-new.txt - sha512sums = 4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42 - sha512sums = 70d7f3855ada6bd06ed707d99d2bc782c8da2f79d236e4d3e0d95ab12e675c8a39d85cd21df8313cd32b00a0227f020c31ab8f77a572d9cf590cbf75655ee426 + sha512sums = 12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae + sha512sums = c56f06606d96a08e7b55ef00e95d57d2931218f2e887f70a2be092dc20e47a3fc40c4898a5d315964f08126eb4860c8d7925e26bc52acf0dbaf681e6906f2915 sha512sums = a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4 - sha512sums = e3810d59408b303601c9fae95cafaa140019b214b452d36b0ce6017f5724f3c35d8b7f8c06c2c20118ddffeb7faa70ddea09de62e60ab12ddbc2d9e875a68421 - sha512sums = c765776ade02eab1a5b2a56b7848f36b7a2e4523e3e753c9a18223bef7307240d867782aa0a4aca9697efd9615fa48cdb8cafdf86d4e344560128abde30c310f - sha512sums = d92dc4745fd335d4c755c9a672741e3c10582a60cf0c81fa74e2f8ae0377c7310c8787cd11dc15d3667703829f12cd3dd9fd288fc8d047d1037ca2333719f05e + sha512sums = 1c97696602817701590faac010855702f74e1a4c9b628e6c27b53187dc27fd563a57f2027cd3af94377bf189b48fdd8e5b154b2b9314bec893234cdf4100c175 + sha512sums = 78578e1e736d946ff09c4f2eeaa9a667d5baeb56918dc702b9eae6969aaf62369207612e6825d0b4f88cd70ec5f120400d7badcbe95255a5486077805c60d730 + sha512sums = 9f2d532dd2f7c897f6082aee8a1164fcd9f639e49bd1f025ae2b6ca7a97560ad0b34971a618eb669cdfc19a86426850bae4c7600805a4ce9fc40576154971f08 sha512sums = 07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845 sha512sums = 7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b -pkgname = forge-server-1.11.2 +pkgname = forge-server-1.10.2 diff --git a/.gitignore b/.gitignore index a6892264d256..d97cf480b031 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ * -!forge-server-1.11.2.install -!forge-1.11.2d-backup.service -!forge-1.11.2d-backup.timer -!forge-1.11.2d.conf -!forge-1.11.2d.service -!forge-1.11.2d.sh +!forge-server-1.10.2.install +!forge-1.10.2d-backup.service +!forge-1.10.2d-backup.timer +!forge-1.10.2d.conf +!forge-1.10.2d.service +!forge-1.10.2d.sh !LICENSE-fml.txt !LICENSE-new.txt !PKGBUILD @@ -3,15 +3,15 @@ # Contributor: Philip Abernethy <chais.z3r0@gmail.com> # Contributor: sowieso <sowieso@dukun.de> -_game="forge-1.11.2" -_server_root="/srv/forge-1.11.2" +_game="forge-1.10.2" +_server_root="/srv/forge-1.10.2" -_minecraft_ver=1.11.2 -_pkgver=${_minecraft_ver}-13.20.1.2386 +_minecraft_ver=1.10.2 +_pkgver=${_minecraft_ver}-12.18.3.2185 -pkgname=forge-server-1.11.2 +pkgname=forge-server-1.10.2 pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 pkgdesc="Minecraft Forge server unit files, script, and jar" arch=('any') url="https://minecraftforge.net/" @@ -30,16 +30,17 @@ source=("${_game}-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/m "LICENSE-fml.txt" "LICENSE-new.txt") noextract=("${_game}-${_pkgver}-installer.jar") -sha512sums=('4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42' - '70d7f3855ada6bd06ed707d99d2bc782c8da2f79d236e4d3e0d95ab12e675c8a39d85cd21df8313cd32b00a0227f020c31ab8f77a572d9cf590cbf75655ee426' +sha512sums=('12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae' + 'c56f06606d96a08e7b55ef00e95d57d2931218f2e887f70a2be092dc20e47a3fc40c4898a5d315964f08126eb4860c8d7925e26bc52acf0dbaf681e6906f2915' 'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4' - 'e3810d59408b303601c9fae95cafaa140019b214b452d36b0ce6017f5724f3c35d8b7f8c06c2c20118ddffeb7faa70ddea09de62e60ab12ddbc2d9e875a68421' - 'c765776ade02eab1a5b2a56b7848f36b7a2e4523e3e753c9a18223bef7307240d867782aa0a4aca9697efd9615fa48cdb8cafdf86d4e344560128abde30c310f' - 'd92dc4745fd335d4c755c9a672741e3c10582a60cf0c81fa74e2f8ae0377c7310c8787cd11dc15d3667703829f12cd3dd9fd288fc8d047d1037ca2333719f05e' + '1c97696602817701590faac010855702f74e1a4c9b628e6c27b53187dc27fd563a57f2027cd3af94377bf189b48fdd8e5b154b2b9314bec893234cdf4100c175' + '78578e1e736d946ff09c4f2eeaa9a667d5baeb56918dc702b9eae6969aaf62369207612e6825d0b4f88cd70ec5f120400d7badcbe95255a5486077805c60d730' + '9f2d532dd2f7c897f6082aee8a1164fcd9f639e49bd1f025ae2b6ca7a97560ad0b34971a618eb669cdfc19a86426850bae4c7600805a4ce9fc40576154971f08' '07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845' '7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b') prepare() { + mkdir mods java -jar "${_game}-${_pkgver}-installer.jar" --installServer } @@ -52,6 +53,7 @@ package() { install -Dm644 "${_game}d.service" "${pkgdir}/usr/lib/systemd/system/${_game}d.service" install -Dm644 "${_game}d-backup.service" "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.service" install -Dm644 "${_game}d-backup.timer" "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.timer" + install -Dm644 "mods/mod_list.json" "${pkgdir}${_server_root}/mods/mod_list.json" install -Dm644 "forge-${_pkgver}-universal.jar" "${pkgdir}${_server_root}/${_game}-${_pkgver}.jar" install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}${_server_root}/minecraft_server.${_minecraft_ver}.jar" ln -s "${_game}-${_pkgver}.jar" "${pkgdir}${_server_root}/${_game}.jar" diff --git a/forge-1.11.2d-backup.service b/forge-1.10.2d-backup.service index 1ae94ae4e139..6b51925223d8 100644 --- a/forge-1.11.2d-backup.service +++ b/forge-1.10.2d-backup.service @@ -4,9 +4,9 @@ After=local-fs.target [Service] Type=forking -ExecStart=/usr/bin/forge-1.11.2d backup -User=forge-1-11-2 -Group=forge-1-11-2 +ExecStart=/usr/bin/forge-1.10.2d backup +User=forge-1-10-2 +Group=forge-1-10-2 [Install] WantedBy=multi-user.target diff --git a/forge-1.11.2d-backup.timer b/forge-1.10.2d-backup.timer index 882aa3bcbcd3..882aa3bcbcd3 100644 --- a/forge-1.11.2d-backup.timer +++ b/forge-1.10.2d-backup.timer diff --git a/forge-1.11.2d.conf b/forge-1.10.2d.conf index 44004dde9293..2fdb7b2607d6 100644 --- a/forge-1.11.2d.conf +++ b/forge-1.10.2d.conf @@ -2,13 +2,13 @@ # Variables are interpreted in bash. Simply using bash-syntax is sufficient. # General parameters -SERVER_ROOT="/srv/forge-1.11.2" -BACKUP_DEST="/srv/forge-1.11.2/backup" +SERVER_ROOT="/srv/forge-1.10.2" +BACKUP_DEST="/srv/forge-1.10.2/backup" BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT KEEP_BACKUPS="10" -GAME_USER="forge-1-11-2" -MAIN_EXECUTABLE="forge-1.11.2.jar" -SESSION_NAME="forge-1.11.2" +GAME_USER="forge-1-10-2" +MAIN_EXECUTABLE="forge-1.10.2.jar" +SESSION_NAME="forge-1.10.2" # System parameters for java # -Xms sets the intial heap size (must be a multiple of 1024 and greater than 2MB, no spaces!) diff --git a/forge-1.11.2d.service b/forge-1.10.2d.service index c40262f97a7f..14796bcba654 100644 --- a/forge-1.11.2d.service +++ b/forge-1.10.2d.service @@ -4,10 +4,10 @@ After=local-fs.target network.target multi-user.target [Service] Type=forking -ExecStart=/usr/bin/forge-1.11.2d start -ExecStop=/usr/bin/forge-1.11.2d stop -User=forge-1-11-2 -Group=forge-1-11-2 +ExecStart=/usr/bin/forge-1.10.2d start +ExecStop=/usr/bin/forge-1.10.2d stop +User=forge-1-10-2 +Group=forge-1-10-2 [Install] WantedBy=multi-user.target diff --git a/forge-1.11.2d.sh b/forge-1.10.2d.sh index 222a01ce3f2b..62853219ad7d 100755 --- a/forge-1.11.2d.sh +++ b/forge-1.10.2d.sh @@ -1,8 +1,8 @@ #!/bin/bash # The actual program name -declare -r myname="forge-1.11.2d" -declare -r game="forge-1.11.2" +declare -r myname="forge-1.10.2d" +declare -r game="forge-1.10.2" # General rule for the variable-naming-schema: # Variables in capital letters may be passed through the command line others not. @@ -13,8 +13,8 @@ declare -r game="forge-1.11.2" [[ -n "${BACKUP_DEST}" ]] && declare -r BACKUP_DEST=${BACKUP_DEST} || BACKUP_DEST="/srv/${game}/backup" [[ -n "${BACKUP_PATHS}" ]] && declare -r BACKUP_PATHS=${BACKUP_PATHS} || BACKUP_PATHS="world" [[ -n "${KEEP_BACKUPS}" ]] && declare -r KEEP_BACKUPS=${KEEP_BACKUPS} || KEEP_BACKUPS="10" -[[ -n "${GAME_USER}" ]] && declare -r GAME_USER=${GAME_USER} || GAME_USER="forge-1-11-2" -[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.11.2.jar" +[[ -n "${GAME_USER}" ]] && declare -r GAME_USER=${GAME_USER} || GAME_USER="forge-1-10-2" +[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.10.2.jar" [[ -n "${SESSION_NAME}" ]] && declare -r SESSION_NAME=${SESSION_NAME} || SESSION_NAME="${game}" # Command and parameter declaration with which to start the server diff --git a/forge-server-1.11.2.install b/forge-server-1.10.2.install index 5856c930e774..eaf25a0b6342 100644 --- a/forge-server-1.11.2.install +++ b/forge-server-1.10.2.install @@ -1,6 +1,6 @@ -_game="forge-1.11.2" -_user="forge-1-11-2" -_server_root="/srv/forge-1.11.2" +_game="forge-1.10.2" +_user="forge-1-10-2" +_server_root="/srv/forge-1.10.2" post_install() { getent group "${_user}" &>/dev/null |