Skip to content

Commit ba31307

Browse files
yohanhounsounouyohanhounsounou
committed
fix confupdate issue
1 parent 8e9aa3c commit ba31307

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎pushconfig.sh‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -166,33 +166,33 @@ function add_config() {
166166
local exi=$2
167167
local url=$3
168168
exi_main=$exi
169-
num_new=$(echo $new | jq length)
169+
num_new=$(echo "$new" | jq length)
170170

171171
for n in $(seq 0 $(($num_new - 1))); do
172-
new_conf=$(echo $new | jq .[$n])
173-
new_uuid=$(echo $new_conf | jq -r .uuid)
174-
new_conf=$(echo $new_conf | jq "$REMUUID_FUNCTION")
172+
new_conf=$(echo "$new" | jq .[$n])
173+
new_uuid=$(echo "$new_conf" | jq -r .uuid)
174+
new_conf=$(echo "$new_conf" | jq "$REMUUID_FUNCTION")
175175

176-
new_md5="$(echo $new_conf | md5sum)"
177-
new_name="$(echo $new_conf | jq -r .name)"
178-
new_location="$(echo $new_conf | jq .location)"
179-
new_regex="$(echo $new_conf | jq .regex)"
176+
new_md5="$(echo "$new_conf" | md5sum)"
177+
new_name="$(echo "$new_conf" | jq -r .name)"
178+
new_location="$(echo "$new_conf" | jq .location)"
179+
new_regex="$(echo "$new_conf" | jq .regex)"
180180

181181
exi=$exi_main
182-
num_exi=$(echo $exi | jq length)
182+
num_exi=$(echo "$exi" | jq length)
183183

184184
action="post"
185185
exi_conf=""
186186

187187
for e in $(seq 0 $(($num_exi - 1))); do
188-
exi_conf=$(echo $exi | jq .[$e])
189-
exi_uuid=$(echo $exi_conf | jq -r .uuid)
190-
exi_conf=$(echo $exi_conf | jq "$REMUUID_FUNCTION")
188+
exi_conf=$(echo "$exi" | jq .[$e])
189+
exi_uuid=$(echo "$exi_conf" | jq -r .uuid)
190+
exi_conf=$(echo "$exi_conf" | jq "$REMUUID_FUNCTION")
191191

192-
exi_md5="$(echo $exi_conf | md5sum)"
193-
exi_name=$(echo $exi_conf | jq -r .name)
194-
exi_location=$(echo $exi_conf | jq .location)
195-
exi_regex=$(echo $exi_conf | jq .regex)
192+
exi_md5="$(echo "$exi_conf" | md5sum)"
193+
exi_name=$(echo "$exi_conf" | jq -r .name)
194+
exi_location=$(echo "$exi_conf" | jq .location)
195+
exi_regex=$(echo "$exi_conf" | jq .regex)
196196

197197
# If the conf are bit identical, obvisouly do nothing!
198198
if [ "$new_md5" == "$exi_md5" ]; then
@@ -229,42 +229,42 @@ function add_config() {
229229
if [ "$exi_conf" != "" ]; then
230230
# Remove this entry from existinf conf to speed up the processing
231231
if [ "$exi_name" != "null" ]; then
232-
exi_main=$(echo $exi_main | jq ". | del(.[] | select(.name==\"$exi_name\"))")
232+
exi_main=$(echo "$exi_main" | jq ". | del(.[] | select(.name==\"$exi_name\"))")
233233
fi
234234
if [ "$exi_location" != "null" ]; then
235-
exi_main=$(echo $exi_main | jq ". | del(.[] | select(.location==$exi_location))")
235+
exi_main=$(echo "$exi_main" | jq ". | del(.[] | select(.location==$exi_location))")
236236
fi
237237
if [ "$exi_regex" != "null" ]; then
238-
exi_main=$(echo $exi_main | jq ". | del(.[] | select(.regex==$exi_regex))")
238+
exi_main=$(echo "$exi_main" | jq ". | del(.[] | select(.regex==$exi_regex))")
239239
fi
240240
if [ "$exi_uuid" != "null" ]; then
241-
exi_main=$(echo $exi_main | jq ". | del(.[] | select(.uuid==\"$exi_uuid\"))")
241+
exi_main=$(echo "$exi_main" | jq ". | del(.[] | select(.uuid==\"$exi_uuid\"))")
242242
fi
243243
fi
244244
fi
245245

246246
if [ "$action" == "post" ]; then
247247
tmp=$(mktemp)
248-
echo $new_conf >$tmp
248+
printf '%s' "$new_conf" >"$tmp"
249249
printf "+"
250-
$VERBOSE && printf "\nWill post $(echo new_conf | jq .)"
251-
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X POST -H "Content-Type: application/json" "${url}" -d@$tmp
252-
rm $tmp
250+
$VERBOSE && printf "\nWill post %s" "$(echo "$new_conf" | jq .)"
251+
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X POST -H "Content-Type: application/json" "${url}" -d@"$tmp"
252+
rm "$tmp"
253253
elif [ "$action" == "put" ]; then
254254
tmp=$(mktemp)
255255
# Use name if exists, or uuid if exists
256256
if [ "$exi_uuid" != "null" ]; then
257-
echo $new_conf | jq ". += {\"uuid\":\"$exi_uuid\"}" >$tmp
258-
$VERBOSE && printf "\nWill put $(echo $new_conf | jq .)"
259-
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X PUT -H "Content-Type: application/json" "${url}/${exi_uuid}" -d@$tmp
257+
echo "$new_conf" | jq ". += {\"uuid\":\"$exi_uuid\"}" >"$tmp"
258+
$VERBOSE && printf "\nWill put %s" "$(echo "$new_conf" | jq .)"
259+
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X PUT -H "Content-Type: application/json" "${url}/${exi_uuid}" -d@"$tmp"
260260
elif [ "$exi_name" != "null" ]; then
261-
echo $new_conf >$tmp
262-
$VERBOSE && printf "\nWill put $(echo $new_conf | jq .)"
263-
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X PUT -H "Content-Type: application/json" "${url}/${exi_name}" -d@$tmp
261+
printf '%s' "$new_conf" >"$tmp"
262+
$VERBOSE && printf "\nWill put %s" "$(echo "$new_conf" | jq .)"
263+
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X PUT -H "Content-Type: application/json" "${url}/${exi_name}" -d@"$tmp"
264264
else
265265
echo "WTF"
266266
fi
267-
rm $tmp
267+
rm "$tmp"
268268
printf "*"
269269
else
270270
$VERBOSE && printf "\nNot touching $(echo $exi_conf | jq .)"
@@ -344,28 +344,28 @@ function delete_config() {
344344
if [ "$action" == "idle" ] && [ "$new_conf" != "" ]; then
345345
# Remove this entry from existing conf to speed up the processing
346346
if [ "$new_name" != "null" ]; then
347-
new_main=$(echo $new_main | jq ". | del(.[] | select(.name==\"$new_name\"))")
347+
new_main=$(echo "$new_main" | jq ". | del(.[] | select(.name==\"$new_name\"))")
348348
fi
349349
if [ "$new_location" != "null" ]; then
350-
new_main=$(echo $new_main | jq ". | del(.[] | select(.location==$new_location))")
350+
new_main=$(echo "$new_main" | jq ". | del(.[] | select(.location==$new_location))")
351351
fi
352352
if [ "$new_regex" != "null" ]; then
353-
new_main=$(echo $new_main | jq ". | del(.[] | select(.regex==$new_regex))")
353+
new_main=$(echo "$new_main" | jq ". | del(.[] | select(.regex==$new_regex))")
354354
fi
355355
fi
356356
if [ "$action" == "delete" ]; then
357357
printf "-"
358358
if [ "$exi_uuid" != "null" ]; then
359-
$VERBOSE && printf "\nDeleting $(echo $exi_conf | jq .)"
359+
$VERBOSE && printf "\nDeleting %s" "$(echo "$exi_conf" | jq .)"
360360
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X DELETE "${url}/${exi_uuid}"
361361
elif [ "$exi_name" != "null" ]; then
362-
$VERBOSE && printf "\nDeleting $(echo $exi_conf | jq .)"
362+
$VERBOSE && printf "\nDeleting %s" "$(echo "$exi_conf" | jq .)"
363363
$NO_DRY_RUN && curl $CURL_AUTH_ARGUMENTS $CURL_COMMON_ARGUMENTS -X DELETE "${url}/${exi_name}"
364364
else
365365
echo "Unhandled Error : delete action without uuid or name."
366366
fi
367367
else
368-
$VERBOSE && printf "\nNot touching $(echo $exi_conf | jq .)"
368+
$VERBOSE && printf "\nNot touching %s" "$(echo "$exi_conf" | jq .)"
369369
printf "."
370370
fi
371371
done
@@ -421,7 +421,7 @@ function update_configuration() {
421421
printf "Updating $service"
422422
while [ TRUE ]; do
423423
# Read configuration
424-
config=$(eval "envsubst <$configfile '"$VARS"' | jq .[$i]")
424+
config=$(envsubst "$VARS" <"$configfile" | jq .[$i])
425425
if [ "$config" == "null" ]; then
426426
break
427427
elif [ -z "$config" ]; then
@@ -434,11 +434,11 @@ function update_configuration() {
434434
fi
435435

436436
# Retreive and compose path
437-
path=$(echo $config | jq -r .url)
437+
path=$(echo "$config" | jq -r .url)
438438
full_url="$base_url$path"
439439

440440
# Get new confs
441-
new_confs=$(echo $config | jq .confs | jq -S .)
441+
new_confs=$(echo "$config" | jq .confs | jq -S .)
442442

443443
# Get existing confs
444444
tmp=$(mktemp)

0 commit comments

Comments
 (0)