From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 8 Aug 2018 20:11:47 +0100
Subject: gentoo resync : 08.08.2018

---
 games-server/minecraft-server/files/README.gentoo  | 20 +++++++++
 .../files/minecraft-server-r1.initd                | 47 +++++++++++++++++++++
 .../minecraft-server/files/minecraft-server.initd  | 48 ----------------------
 3 files changed, 67 insertions(+), 48 deletions(-)
 create mode 100644 games-server/minecraft-server/files/README.gentoo
 create mode 100644 games-server/minecraft-server/files/minecraft-server-r1.initd
 delete mode 100644 games-server/minecraft-server/files/minecraft-server.initd

(limited to 'games-server/minecraft-server/files')

diff --git a/games-server/minecraft-server/files/README.gentoo b/games-server/minecraft-server/files/README.gentoo
new file mode 100644
index 000000000000..ae8c62a9cbf2
--- /dev/null
+++ b/games-server/minecraft-server/files/README.gentoo
@@ -0,0 +1,20 @@
+This package provides an init script and a conf file.
+You don't have to modify those files directly,
+but instead you can make a symlink of that init script
+and a copy of that conf file.
+You would do this for every server, you want to setup.
+
+For example, you wan't to setup an world called 'gentoo',
+you would do:
+
+cd /etc/init.d
+ln -s minecraft-server minecraft-server.gentoo
+
+cd /etc/conf.d
+cp minecraft-server minecraft-server.gentoo
+
+After that, make your settings in
+/etc/conf.d/minecraft-server.gentoo.
+
+If you don't make a symlink, but use the default scripts,
+your world will be called 'main'.
diff --git a/games-server/minecraft-server/files/minecraft-server-r1.initd b/games-server/minecraft-server/files/minecraft-server-r1.initd
new file mode 100644
index 000000000000..872885ecd643
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server-r1.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "minecraft-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#minecraft-server.}"
+fi
+
+minecraft_command="/usr/bin/minecraft-server"
+minecraft_logs="/var/log/minecraft-server"
+minecraft_path="/var/lib/minecraft-server/${instance}"
+name="Minecraft Server (World: ${instance})"
+pidfile="/run/minecraft-server.${instance}.pid"
+screen_name="minecraft-server.${instance}"
+start_stop_daemon_args="--chdir ${minecraft_path} --env JAVA_OPTS=\"${MINECRAFT_OPTS}\""
+
+command="screen"
+command_args="-DmUS ${screen_name} ${minecraft_command}"
+command_background="true"
+command_group="minecraft"
+command_user="minecraft"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
+
+	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
+	echo "eula=true" > "${minecraft_path}"/eula.txt
+
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
+
+	if [ ! -L "${minecraft_path}"/logs ]; then
+		cd "${minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
+	fi
+
+	if [ -z ${MINECRAFT_OPTS} ]; then
+		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
+		return 1
+	fi
+
+	return 0
+}
diff --git a/games-server/minecraft-server/files/minecraft-server.initd b/games-server/minecraft-server/files/minecraft-server.initd
deleted file mode 100644
index 630c88871d76..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-java="${JAVA_HOME-/usr}"/bin/java
-minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar ${minecraft_jar}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
-	echo "eula=true" > "${minecraft_path}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
-
-	if [ ! -L "${minecraft_path}"/logs ]; then
-		cd "$minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z ${MINECRAFT_OPTS} ]; then
-		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
-		return 1
-	fi
-
-	return 0
-}
-- 
cgit v1.2.3