[gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     f65ae824e515ea9041f9feb3d0a0ee621bed50ec
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 14:58:59 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 14:58:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65ae824

games-server/bedrock-server: fix json install

The file 'whitelist.json' has been renamed to 'allowlist.json'.

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...ock-server-1.18.12.01.ebuild => bedrock-server-1.18.12.01-r1.ebuild} | 2 +-
 .../files/{bedrock-server.initd-r2 => bedrock-server.initd-r3}          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
similarity index 94%
rename from games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
index dba2b5b775bb..13bf440c68d3 100644
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
@@ -46,7 +46,7 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
+	newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server
 	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
 
 	einstalldocs

diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r3
similarity index 95%
rename from games-server/bedrock-server/files/bedrock-server.initd-r2
rename to games-server/bedrock-server/files/bedrock-server.initd-r3
index 1ff60aa7816f..6c2e7cb5e9f9 100644
--- a/games-server/bedrock-server/files/bedrock-server.initd-r2
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r3
@@ -33,7 +33,7 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
 
-	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
+	local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" )
 	for bedrock_config in ${bedrock_configs[@]}; do
 		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
 			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"