mirror of https://git.envs.net/envs/ops.git
okay.
This commit is contained in:
parent
1fc25b4c7f
commit
4d68701a19
|
@ -28,30 +28,32 @@ progress_userarray() {
|
||||||
if [[ ":${field_is_array[*]}:" =~ $field_name ]] && ! [[ ":${field_finished[*]}:" =~ $field_name ]]; then
|
if [[ ":${field_is_array[*]}:" =~ $field_name ]] && ! [[ ":${field_finished[*]}:" =~ $field_name ]]; then
|
||||||
# begin of user def. array
|
# begin of user def. array
|
||||||
if [ -z "$field_in_progress" ] && [ "$field_count" -eq 0 ]; then
|
if [ -z "$field_in_progress" ] && [ "$field_count" -eq 0 ]; then
|
||||||
|
fin_count='0'
|
||||||
field_in_progress="$field_name"
|
field_in_progress="$field_name"
|
||||||
cat << EOM >> "$TMP_JSON"
|
cat << EOM >> "$TMP_JSON"
|
||||||
"$field_name": [
|
"$field_name": [
|
||||||
"${line_to_set[$field]}",
|
"${line_to_set[$field]}",
|
||||||
EOM
|
EOM
|
||||||
else
|
elif [ "$field_in_progress" = "$field_name" ] && [ "$field_count" = "$(( $fin_count + 1 ))" ]; then
|
||||||
if [ "$field_in_progress" = "$field_name" ]; then
|
# continue user def. array
|
||||||
# continue user def. array
|
fin_count="$(( $fin_count + 1 ))"
|
||||||
cat << EOM >> "$TMP_JSON"
|
cat << EOM >> "$TMP_JSON"
|
||||||
"${line_to_set[$field]}",
|
"${line_to_set[$field]}",
|
||||||
EOM
|
EOM
|
||||||
if [ "$field_count" = "${hc_field_entry[$field_name]}" ]; then
|
if [ "$field_count" = "${hc_field_entry[$field_name]}" ]; then
|
||||||
# end of user def. array
|
# end of user def. array
|
||||||
# remove trailing ',' on last user entry
|
# remove trailing ',' on last user entry
|
||||||
clear_lastline
|
clear_lastline
|
||||||
cat << EOM >> "$TMP_JSON"
|
cat << EOM >> "$TMP_JSON"
|
||||||
],
|
],
|
||||||
EOM
|
EOM
|
||||||
unset field_in_progress
|
unset field_in_progress
|
||||||
field_finished+=( "$field_name" )
|
field_finished+=( "$field_name" )
|
||||||
fi
|
else
|
||||||
elif ! [ "$field_in_progress" = "$field_name" ] && ! [[ ":${field_queue[*]}:" =~ $field_name ]]; then
|
progress_userarray
|
||||||
field_queue+=( "$field_name" )
|
|
||||||
fi
|
fi
|
||||||
|
elif ! [ "$field_in_progress" = "$field_name" ] && ! [[ ":${field_queue[*]}:" =~ $field_name ]]; then
|
||||||
|
field_queue+=( "$field_name" )
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue