From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4105715808B for ; Sun, 3 Apr 2022 15:00:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47F77E08ED; Sun, 3 Apr 2022 15:00:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D2F9E08ED for ; Sun, 3 Apr 2022 15:00:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC4A8340F79 for ; Sun, 3 Apr 2022 15:00:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A499D0 for ; Sun, 3 Apr 2022 15:00:05 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1648997939.f65ae824e515ea9041f9feb3d0a0ee621bed50ec.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild games-server/bedrock-server/files/bedrock-server.initd-r2 games-server/bedrock-server/files/bedrock-server.initd-r3 X-VCS-Directories: games-server/bedrock-server/ games-server/bedrock-server/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f65ae824e515ea9041f9feb3d0a0ee621bed50ec X-VCS-Branch: master Date: Sun, 3 Apr 2022 15:00:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 06c89087-8df9-4dcf-bea4-428d1e9fe152 X-Archives-Hash: 53490593088adf17a134e349f538f3b2 commit: f65ae824e515ea9041f9feb3d0a0ee621bed50ec Author: Conrad Kostecki gentoo org> AuthorDate: Sun Apr 3 14:58:59 2022 +0000 Commit: Conrad Kostecki gentoo 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 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}"