Skip to content

Commit

Permalink
Change apps list functions to return upper case
Browse files Browse the repository at this point in the history
  • Loading branch information
CLHatch committed Feb 1, 2025
1 parent 9c1ca6b commit 4d36a06
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .scripts/builtin_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ set -Eeuo pipefail
IFS=$'\n\t'

builtin_apps() {
find "${TEMPLATES_FOLDER}" -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort || true
find "${TEMPLATES_FOLDER}" -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | tr '[:lower:]' '[:upper:]'| sort || true
}

test_builtin_apps() {
# run_script 'builtin_apps'
warn "CI does not test builtin_apps."
run_script 'builtin_apps'
# warn "CI does not test builtin_apps."
}
2 changes: 1 addition & 1 deletion .scripts/disabled_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IFS=$'\n\t'

disabled_apps() {
#grep --color=never -o -P '^\s*\K([A-Z][A-Z0-9]*(__[A-Z0-9]+)?)(?=_ENABLED='"'"'?false'"'"'?$)' "${COMPOSE_ENV}"
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*='"'"'?false'"'"'?$)' "${COMPOSE_ENV}" | tr '[:upper:]' '[:lower:]' | sort || true
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*='"'"'?false'"'"'?$)' "${COMPOSE_ENV}" | sort || true
}

test_disabled_apps() {
Expand Down
2 changes: 1 addition & 1 deletion .scripts/enabled_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IFS=$'\n\t'

enabled_apps() {
#grep --color=never -o -P '^\s*\K([A-Z][A-Z0-9]*(__[A-Z0-9]+)?)(?=_ENABLED='"'"'?true'"'"'?$)' "${COMPOSE_ENV}"
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*='"'"'?true'"'"'?$)' "${COMPOSE_ENV}" | tr '[:upper:]' '[:lower:]' | sort || true
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*='"'"'?true'"'"'?$)' "${COMPOSE_ENV}" | sort || true
}

test_enabled_apps() {
Expand Down
2 changes: 1 addition & 1 deletion .scripts/installed_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IFS=$'\n\t'

installed_apps() {
#grep --color=never -o -P '^\s*\K([A-Z][A-Z0-9]*(__[A-Z0-9]+)?)(?==)' "${COMPOSE_ENV}"
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*=)' "${COMPOSE_ENV}" | tr '[:upper:]' '[:lower:]' | sort || true
grep --color=never -o -P '^\s*\K[A-Z][A-Z0-9]*(?=__ENABLED\s*=)' "${COMPOSE_ENV}" | sort || true
}

test_installed_apps() {
Expand Down

0 comments on commit 4d36a06

Please sign in to comment.