commit: b40142a2bd955692fa5bcb6d16920d8c1cfd9096 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Apr 9 14:38:49 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 9 14:40:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40142a2
games-server/bedrock-server: fix shell script with non-POSIX features Closes: https://bugs.gentoo.org/836701 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...r-1.18.12.01-r1.ebuild => bedrock-server-1.18.12.01-r2.ebuild} | 2 +- .../files/{bedrock-server.initd-r3 => bedrock-server.initd-r4} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild similarity index 94% rename from games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild index 13bf440c68d3..520bc15c7abd 100644 --- a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild +++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild @@ -46,7 +46,7 @@ src_install() { dodir /opt/bin dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server - newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server + newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server einstalldocs diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r3 b/games-server/bedrock-server/files/bedrock-server.initd-r4 similarity index 86% rename from games-server/bedrock-server/files/bedrock-server.initd-r3 rename to games-server/bedrock-server/files/bedrock-server.initd-r4 index 6c2e7cb5e9f9..2bc351490e96 100644 --- a/games-server/bedrock-server/files/bedrock-server.initd-r3 +++ b/games-server/bedrock-server/files/bedrock-server.initd-r4 @@ -33,16 +33,16 @@ depend() { start_pre() { checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}" - local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" ) - for bedrock_config in ${bedrock_configs[@]}; do + set -- "allowlist.json" "permissions.json" "server.properties" + for bedrock_config in $@; do if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}" checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}" fi done - local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" ) - for bedrock_ressource in ${bedrock_ressources[@]}; do + set -- "behavior_packs" "definitions" "resource_packs" "structures" + for bedrock_ressource in $@; do if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}" fi
