Skip to content

Commit 4c15711

Browse files
committed
Fix linting errors
1 parent db01044 commit 4c15711

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.scripts/app_list_referenced.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ app_list_referenced() {
66
local APPNAME_REGEX='^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?'
77
local REFERENCED_APPS_REGEX="${APPNAME_REGEX}(?=__[A-Za-z0-9]\w*\s*=)"
88

9-
grep --color=never -o -P "${REFERENCED_APPS_REGEX}" "${COMPOSE_ENV}" | sort -u || true
9+
grep --color=never -o -P "${REFERENCED_APPS_REGEX}" "${COMPOSE_ENV}" | sort -u || true
1010
}
1111

1212
test_app_list_referenced() {

.scripts/env_format_lines.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env_format_lines() {
77
local ENV_DEFAULT_FILE=${2-}
88
local APPNAME=${3-}
99
APPNAME=${APPNAME^^}
10-
local appname=${APPNAME,,}
10+
#local appname=${APPNAME,,}
1111

1212
local TOP_SECTION='false'
1313
#notice "["
@@ -51,7 +51,7 @@ env_format_lines() {
5151
FORMATTED_ENV_VAR_INDEX[$VAR]=$index
5252
done
5353

54-
if [[ -n ${CURRENT_ENV_LINES[@]-} ]]; then
54+
if [[ -n ${CURRENT_ENV_LINES[*]} ]]; then
5555
# Update the default variables
5656
for index in "${!CURRENT_ENV_LINES[@]}"; do
5757
local line=${CURRENT_ENV_LINES[index]}
@@ -60,12 +60,12 @@ env_format_lines() {
6060
if [[ -n ${FORMATTED_ENV_VAR_INDEX["$VAR"]-} ]]; then
6161
# Variable already exists, update its value
6262
VAR_INDEX=${FORMATTED_ENV_VAR_INDEX["$VAR"]-}
63-
FORMATTED_ENV_LINES[$VAR_INDEX]=$line
63+
FORMATTED_ENV_LINES[VAR_INDEX]=$line
6464
unset 'CURRENT_ENV_LINES[index]'
6565
fi
6666
done
6767
CURRENT_ENV_LINES=("${CURRENT_ENV_LINES[@]-}")
68-
if [[ -n ${CURRENT_ENV_LINES[@]-} ]]; then
68+
if [[ -n ${CURRENT_ENV_LINES[*]} ]]; then
6969
if [[ ${TOP_SECTION} == true ]]; then
7070
# Add a blank if there was a previous section
7171
FORMATTED_ENV_LINES+=("")

.scripts/env_update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_update() {
88
run_script 'appvars_lines' "" > "${ENV_LINES_FILE}"
99

1010
local -a UPDATED_ENV_LINES=()
11-
readarray -t UPDATED_ENV_LINES < <( \
11+
readarray -t UPDATED_ENV_LINES < <(
1212
run_script 'env_format_lines' "${ENV_LINES_FILE}" "${COMPOSE_ENV_DEFAULT_FILE}" ""
1313
)
1414

0 commit comments

Comments
 (0)