Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
Date: Sun, 03 Apr 2022 15:00:13
Message-Id: 1648997939.f65ae824e515ea9041f9feb3d0a0ee621bed50ec.conikost@gentoo
1 commit: f65ae824e515ea9041f9feb3d0a0ee621bed50ec
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 3 14:58:59 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 3 14:58:59 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65ae824
7
8 games-server/bedrock-server: fix json install
9
10 The file 'whitelist.json' has been renamed to 'allowlist.json'.
11
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 ...ock-server-1.18.12.01.ebuild => bedrock-server-1.18.12.01-r1.ebuild} | 2 +-
15 .../files/{bedrock-server.initd-r2 => bedrock-server.initd-r3} | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18 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
19 similarity index 94%
20 rename from games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
21 rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
22 index dba2b5b775bb..13bf440c68d3 100644
23 --- a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
24 +++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
25 @@ -46,7 +46,7 @@ src_install() {
26 dodir /opt/bin
27 dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
28
29 - newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
30 + newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server
31 newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
32
33 einstalldocs
34
35 diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r3
36 similarity index 95%
37 rename from games-server/bedrock-server/files/bedrock-server.initd-r2
38 rename to games-server/bedrock-server/files/bedrock-server.initd-r3
39 index 1ff60aa7816f..6c2e7cb5e9f9 100644
40 --- a/games-server/bedrock-server/files/bedrock-server.initd-r2
41 +++ b/games-server/bedrock-server/files/bedrock-server.initd-r3
42 @@ -33,7 +33,7 @@ depend() {
43 start_pre() {
44 checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
45
46 - local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
47 + local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" )
48 for bedrock_config in ${bedrock_configs[@]}; do
49 if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
50 cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"