3
3
set -eu
4
4
set -o pipefail
5
5
6
- source " $( dirname " $ {BASH_SOURCE[0]} " ) /helpers.sh"
6
+ source " ${BASH_SOURCE[0]%/* } " /helpers.sh
7
7
8
8
9
9
# --------------------------------------------------------
@@ -33,7 +33,7 @@ roles_files=(
33
33
34
34
echo " -------- $( date) --------"
35
35
36
- state_file=" $( dirname " $ {BASH_SOURCE[0]} " ) /state/.done"
36
+ state_file=" ${BASH_SOURCE[0]%/* } " /state/.done
37
37
if [[ -e " $state_file " ]]; then
38
38
log " State file exists at '${state_file} ', skipping setup"
39
39
exit 0
65
65
66
66
sublog ' Elasticsearch is running'
67
67
68
+ log ' Waiting for initialization of built-in users'
69
+
70
+ wait_for_builtin_users || exit_code=$?
71
+
72
+ if (( exit_code)) ; then
73
+ suberr ' Timed out waiting for condition'
74
+ exit $exit_code
75
+ fi
76
+
77
+ sublog ' Built-in users were initialized'
78
+
68
79
for role in " ${! roles_files[@]} " ; do
69
80
log " Role '$role '"
70
81
71
82
declare body_file
72
- body_file=" $( dirname " $ {BASH_SOURCE[0]} " ) /roles/${roles_files[$role]:- } "
83
+ body_file=" ${BASH_SOURCE[0]%/* } /roles/${roles_files[$role]:- } "
73
84
if [[ ! -f " ${body_file:- } " ]]; then
74
85
sublog " No role body found at '${body_file} ', skipping"
75
86
continue
@@ -94,7 +105,7 @@ for user in "${!users_passwords[@]}"; do
94
105
set_user_password " $user " " ${users_passwords[$user]} "
95
106
else
96
107
if [[ -z " ${users_roles[$user]:- } " ]]; then
97
- err ' No role defined, skipping creation'
108
+ suberr ' No role defined, skipping creation'
98
109
continue
99
110
fi
100
111
@@ -103,5 +114,5 @@ for user in "${!users_passwords[@]}"; do
103
114
fi
104
115
done
105
116
106
- mkdir -p " $( dirname " $ {state_file} " ) "
117
+ mkdir -p " ${state_file%/* } "
107
118
touch " $state_file "
0 commit comments