Skip to content

Commit 0682453

Browse files
committed
Update env_format_lines.sh
Break `< <(...)` lines to multiple lines for readability. Remove some commented code.
1 parent 89954f6 commit 0682453

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.scripts/env_format_lines.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ env_format_lines() {
1010
#local appname=${APPNAME,,}
1111

1212
local TOP_SECTION='false'
13-
#notice "["
1413
local -a CURRENT_ENV_LINES=()
15-
readarray -t CURRENT_ENV_LINES < <(run_script 'env_lines' "${ENV_FILE}" || true)
14+
readarray -t CURRENT_ENV_LINES < <(
15+
run_script 'env_lines' "${ENV_FILE}"
16+
)
1617

1718
local -a FORMATTED_ENV_LINES=()
1819
if [[ -n ${APPNAME} ]] && run_script 'app_is_installed' "${APPNAME}"; then
@@ -26,7 +27,9 @@ env_format_lines() {
2627
fi
2728
local HEADING
2829
printf -v HEADING "##\n## %s\n##" "${HEADING_TITLE}"
29-
readarray -t -O ${#FORMATTED_ENV_LINES[@]} FORMATTED_ENV_LINES < <(printf '%s\n' "${HEADING}")
30+
readarray -t -O ${#FORMATTED_ENV_LINES[@]} FORMATTED_ENV_LINES < <(
31+
printf '%s\n' "${HEADING}"
32+
)
3033
TOP_SECTION='true'
3134
fi
3235
if [[ -n ${ENV_DEFAULT_FILE} && -f ${ENV_DEFAULT_FILE} ]]; then
@@ -43,7 +46,9 @@ env_format_lines() {
4346
local -A FORMATTED_ENV_VAR_INDEX=()
4447
local -a VAR_LINES=()
4548
# Make an array with the contents "line number:VARIABLE" in each element
46-
readarray -t VAR_LINES < <(printf '%s\n' "${FORMATTED_ENV_LINES[@]}" | grep -n -o -P '^[A-Za-z0-9_]*(?=[=])' || true)
49+
readarray -t VAR_LINES < <(
50+
printf '%s\n' "${FORMATTED_ENV_LINES[@]}" | grep -n -o -P '^[A-Za-z0-9_]*(?=[=])' || true
51+
)
4752
for line in "${VAR_LINES[@]}"; do
4853
local index=${line%:*}
4954
index=$((index - 1))
@@ -66,16 +71,14 @@ env_format_lines() {
6671
done
6772
CURRENT_ENV_LINES=("${CURRENT_ENV_LINES[@]-}")
6873
if [[ -n ${CURRENT_ENV_LINES[*]} ]]; then
69-
#if [[ ${TOP_SECTION} == true ]]; then
70-
# # Add a blank if there was a previous section
71-
# FORMATTED_ENV_LINES+=("")
72-
#fi
7374
# Add the "User Defined" heading
7475
local HEADING_TITLE="${APPNAME}"
7576
HEADING_TITLE+=" (User Defined)"
7677
local HEADING
7778
printf -v HEADING "##\n## %s\n##" "${HEADING_TITLE}"
78-
readarray -t -O ${#FORMATTED_ENV_LINES[@]} FORMATTED_ENV_LINES < <(printf '%s\n' "${HEADING}")
79+
readarray -t -O ${#FORMATTED_ENV_LINES[@]} FORMATTED_ENV_LINES < <(
80+
printf '%s\n' "${HEADING}"
81+
)
7982

8083
# Add the user defined variables
8184
for index in "${!CURRENT_ENV_LINES[@]}"; do
@@ -94,7 +97,6 @@ env_format_lines() {
9497
fi
9598
fi
9699
printf "%s\n" "${FORMATTED_ENV_LINES[@]-}"
97-
#notice "]"
98100
}
99101

100102
test_env_format_lines() {

0 commit comments

Comments
 (0)