@@ -10,9 +10,10 @@ env_format_lines() {
10
10
# local appname=${APPNAME,,}
11
11
12
12
local TOP_SECTION=' false'
13
- # notice "["
14
13
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
+ )
16
17
17
18
local -a FORMATTED_ENV_LINES=()
18
19
if [[ -n ${APPNAME} ]] && run_script ' app_is_installed' " ${APPNAME} " ; then
@@ -26,7 +27,9 @@ env_format_lines() {
26
27
fi
27
28
local HEADING
28
29
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
+ )
30
33
TOP_SECTION=' true'
31
34
fi
32
35
if [[ -n ${ENV_DEFAULT_FILE} && -f ${ENV_DEFAULT_FILE} ]]; then
@@ -43,7 +46,9 @@ env_format_lines() {
43
46
local -A FORMATTED_ENV_VAR_INDEX=()
44
47
local -a VAR_LINES=()
45
48
# 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
+ )
47
52
for line in " ${VAR_LINES[@]} " ; do
48
53
local index=${line%:* }
49
54
index=$(( index - 1 ))
@@ -66,16 +71,14 @@ env_format_lines() {
66
71
done
67
72
CURRENT_ENV_LINES=(" ${CURRENT_ENV_LINES[@]-} " )
68
73
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
73
74
# Add the "User Defined" heading
74
75
local HEADING_TITLE=" ${APPNAME} "
75
76
HEADING_TITLE+=" (User Defined)"
76
77
local HEADING
77
78
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
+ )
79
82
80
83
# Add the user defined variables
81
84
for index in " ${! CURRENT_ENV_LINES[@]} " ; do
@@ -94,7 +97,6 @@ env_format_lines() {
94
97
fi
95
98
fi
96
99
printf " %s\n" " ${FORMATTED_ENV_LINES[@]-} "
97
- # notice "]"
98
100
}
99
101
100
102
test_env_format_lines () {
0 commit comments