From 24f19e46ef78736cdefd2d52df0e52261088a6d4 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 02:37:48 +0200
Subject: [PATCH] env/list

---
 spcd/bootstrap.sh | 66 +++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 400642b..7967e3e 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -376,37 +376,6 @@ SPCD_PM_ZYPPER="zypper"
 # │ e │ functions │
 # ╰───┴───────────╯
 
-spcd_step__environment_print() {
-    spcd_f_ca "list"
-    spcd_f_dns "list"
-    set -- \
-        "GIT_RWX" \
-        "GIT_SPCD" \
-        "GIT_SHUNIT" \
-        "REF_FEATURE" \
-        "REF_RELEASE" \
-        "REF_STAGING" \
-        "TXT_LOCALE" \
-        "URL_ALMA" \
-        "URL_ALPINE" \
-        "URL_ARCH" \
-        "URL_DEBIAN" \
-        "URL_EPEL" \
-        "URL_FEDORA" \
-        "URL_OPENSUSE" \
-        "URL_PYTHON" \
-        "URL_ROCKY" \
-        "URL_UBUNTU"
-    local item name value
-    for item in "${@}"; do
-        name="SPCD_${item}"
-        eval "value=\"\${${name}}\""
-        if [ -n "${value}" ]; then
-            spcd_os_printenv "${name}"
-        fi
-    done
-}
-
 spcd_step__environment_defaults_set() {
     spcd_step "$(spcd_txt_get "set")"
 
@@ -925,6 +894,37 @@ spcd_f_ca_update() {
 # │ f │ env = environment │
 # ╰───┴───────────────────╯
 
+spcd_f_env_list() {
+    spcd_f_ca "list"
+    spcd_f_dns "list"
+    set -- \
+        "GIT_RWX" \
+        "GIT_SPCD" \
+        "GIT_SHUNIT" \
+        "REF_FEATURE" \
+        "REF_RELEASE" \
+        "REF_STAGING" \
+        "TXT_LOCALE" \
+        "URL_ALMA" \
+        "URL_ALPINE" \
+        "URL_ARCH" \
+        "URL_DEBIAN" \
+        "URL_EPEL" \
+        "URL_FEDORA" \
+        "URL_OPENSUSE" \
+        "URL_PYTHON" \
+        "URL_ROCKY" \
+        "URL_UBUNTU"
+    local item name value
+    for item in "${@}"; do
+        name="SPCD_${item}"
+        eval "value=\"\${${name}}\""
+        if [ -n "${value}" ]; then
+            spcd_os_printenv "${name}"
+        fi
+    done
+}
+
 spcd_f_env_workspace() {
     spcd_os_ls "$(realpath .)"
 }
@@ -1561,10 +1561,10 @@ spcd_main() {
     spcd_step_in "Environment"
     spcd_step_in "Defaults"
     spcd_step "Print defined"
-    spcd_step__environment_print
+    spcd_f_env_list
     spcd_step__environment_defaults_set
     spcd_step "Print effective"
-    spcd_step__environment_print
+    spcd_f_env_list
     spcd_step_out
     spcd_step__environment_set_variables
     spcd_step "List workspace"