1 |
commit: b40142a2bd955692fa5bcb6d16920d8c1cfd9096 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 9 14:38:49 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 9 14:40:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40142a2 |
7 |
|
8 |
games-server/bedrock-server: fix shell script with non-POSIX features |
9 |
|
10 |
Closes: https://bugs.gentoo.org/836701 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
...r-1.18.12.01-r1.ebuild => bedrock-server-1.18.12.01-r2.ebuild} | 2 +- |
14 |
.../files/{bedrock-server.initd-r3 => bedrock-server.initd-r4} | 8 ++++---- |
15 |
2 files changed, 5 insertions(+), 5 deletions(-) |
16 |
|
17 |
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 |
18 |
similarity index 94% |
19 |
rename from games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild |
20 |
rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild |
21 |
index 13bf440c68d3..520bc15c7abd 100644 |
22 |
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild |
23 |
+++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild |
24 |
@@ -46,7 +46,7 @@ src_install() { |
25 |
dodir /opt/bin |
26 |
dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server |
27 |
|
28 |
- newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server |
29 |
+ newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server |
30 |
newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server |
31 |
|
32 |
einstalldocs |
33 |
|
34 |
diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r3 b/games-server/bedrock-server/files/bedrock-server.initd-r4 |
35 |
similarity index 86% |
36 |
rename from games-server/bedrock-server/files/bedrock-server.initd-r3 |
37 |
rename to games-server/bedrock-server/files/bedrock-server.initd-r4 |
38 |
index 6c2e7cb5e9f9..2bc351490e96 100644 |
39 |
--- a/games-server/bedrock-server/files/bedrock-server.initd-r3 |
40 |
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r4 |
41 |
@@ -33,16 +33,16 @@ depend() { |
42 |
start_pre() { |
43 |
checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}" |
44 |
|
45 |
- local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" ) |
46 |
- for bedrock_config in ${bedrock_configs[@]}; do |
47 |
+ set -- "allowlist.json" "permissions.json" "server.properties" |
48 |
+ for bedrock_config in $@; do |
49 |
if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then |
50 |
cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}" |
51 |
checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}" |
52 |
fi |
53 |
done |
54 |
|
55 |
- local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" ) |
56 |
- for bedrock_ressource in ${bedrock_ressources[@]}; do |
57 |
+ set -- "behavior_packs" "definitions" "resource_packs" "structures" |
58 |
+ for bedrock_ressource in $@; do |
59 |
if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then |
60 |
ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}" |
61 |
fi |