Support APPNAME__INSTANCENAME in installed_apps, enabled_apps a…

…nd` disabled_apps`
GhostWriters · Feb 1, 2025 · aa3d29c · aa3d29c
1 parent 1de9505
commit aa3d29c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.scripts/disabled_apps.sh b/.scripts/disabled_apps.sh
@@ -3,8 +3,7 @@ set -Eeuo pipefail
 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}" | sort || true
+    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED='"'"'?false'"'"'?)' "${COMPOSE_ENV}" | sort || true
 }
 
 test_disabled_apps() {

diff --git a/.scripts/enabled_apps.sh b/.scripts/enabled_apps.sh
@@ -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}" | sort || true
+    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED='"'"'?true'"'"'?)' "${COMPOSE_ENV}" | sort || true
 }
 
 test_enabled_apps() {

diff --git a/.scripts/installed_apps.sh b/.scripts/installed_apps.sh
@@ -3,8 +3,7 @@ set -Eeuo pipefail
 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}" | sort || true
+    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED\s*=)' "${COMPOSE_ENV}" | sort || true
 }
 
 test_installed_apps() {