From c6c855bdac951c4c73a77956f44b5b21832be0b8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 06:58:12 +0200 Subject: [PATCH 01/21] readme/tasks --- readme.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 8e85647..c8ab4a9 100644 --- a/readme.md +++ b/readme.md @@ -213,13 +213,15 @@ Handle project workflows in a unified way: ### Shell -* banner with constants for characters +* banner + * constants for characters + * dynamic substeps * comment * review repositories handling for systems * opensuse * codecs repository * disable & enable https -* write unit tests +* test ### Shell → Python @@ -247,6 +249,7 @@ Handle project workflows in a unified way: * .py * .sh * maximum line length +* comment * detect ssh private key type * fit banner to text * implement substeps @@ -255,7 +258,7 @@ Handle project workflows in a unified way: * actions * includes * try git repo url variable first for shunit -* write unit tests +* test ### Later From 63ab82e03ee6e84cdd7f1d3bc0d1216abac1dfa4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 07:06:10 +0200 Subject: [PATCH 02/21] banner/top,middle,bottom --- spcd/main.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 5b1b34c..c66e9d9 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1134,9 +1134,9 @@ spcd_banner_add() { spcd_banner_append() { if [ -n "${3}" ]; then - SPCD_BANNER_1="${SPCD_BANNER_1}${1}" - SPCD_BANNER_2="${SPCD_BANNER_2}${2}" - SPCD_BANNER_3="${SPCD_BANNER_3}${3}" + SPCD_BANNER_TOP="${SPCD_BANNER_TOP}${1}" + SPCD_BANNER_MIDDLE="${SPCD_BANNER_MIDDLE}${2}" + SPCD_BANNER_BOTTOM="${SPCD_BANNER_BOTTOM}${3}" fi } @@ -1146,9 +1146,9 @@ spcd_banner_close() { spcd_banner_echo() { echo "\ -${SPCD_BANNER_1} -${SPCD_BANNER_2} -${SPCD_BANNER_3}" +${SPCD_BANNER_TOP} +${SPCD_BANNER_MIDDLE} +${SPCD_BANNER_BOTTOM}" } spcd_banner_open() { @@ -1160,7 +1160,7 @@ spcd_banner_split() { } spcd_banner_unset() { - unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 + unset SPCD_BANNER_TOP SPCD_BANNER_MIDDLE SPCD_BANNER_BOTTOM } # ╭──────────┬─────╮ From c99814393318be6a7c5c4f291e29f0f22e03f240 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 12:03:48 +0200 Subject: [PATCH 03/21] banner/chars --- spcd/main.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index c66e9d9..a902f05 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1097,6 +1097,11 @@ spcd_fill() { # │ internal │ banner │ # ╰──────────┴────────╯ +SPCD_BANNER=1 +SPCD_BANNER_HORIZONTAL="─" +SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" +SPCD_BANNER_UP_AND_HORIZONTAL="┴" + spcd_banner() { spcd_banner_unset spcd_banner_open @@ -1126,7 +1131,9 @@ spcd_banner_add() { if [ -n "${1}" ]; then spcd_ba__text=" ${1} " spcd_ba__length=${#spcd_ba__text} - spcd_ba__filler="$(spcd_fill "${spcd_ba__length}" ─)" + spcd_ba__filler="$( + spcd_fill "${spcd_ba__length}" "${SPCD_BANNER_HORIZONTAL}" + )" spcd_banner_append \ "${spcd_ba__filler}" "${spcd_ba__text}" "${spcd_ba__filler}" fi @@ -1156,7 +1163,10 @@ spcd_banner_open() { } spcd_banner_split() { - spcd_banner_append "┬" "${SPCD_VERT}" "┴" + spcd_banner_append \ + "${SPCD_BANNER_DOWN_AND_HORIZONTAL}" \ + "${SPCD_VERT}" \ + "${SPCD_BANNER_UP_AND_HORIZONTAL}" } spcd_banner_unset() { From 00daad9731566181a0585ad55e5de6c666809ea6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 12:09:49 +0200 Subject: [PATCH 04/21] banner/vertical --- spcd/main.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index a902f05..cafe55f 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1101,6 +1101,7 @@ SPCD_BANNER=1 SPCD_BANNER_HORIZONTAL="─" SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" SPCD_BANNER_UP_AND_HORIZONTAL="┴" +SPCD_BANNER_VERTICAL="│" spcd_banner() { spcd_banner_unset @@ -1148,7 +1149,7 @@ spcd_banner_append() { } spcd_banner_close() { - spcd_banner_append "╮" "${SPCD_VERT}" "╯" + spcd_banner_append "╮" "${SPCD_BANNER_VERTICAL}" "╯" } spcd_banner_echo() { @@ -1159,13 +1160,14 @@ ${SPCD_BANNER_BOTTOM}" } spcd_banner_open() { - spcd_banner_append "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" + spcd_banner_append \ + "${SPCD_BOX_DOWN}" "${SPCD_BANNER_VERTICAL}" "${SPCD_BOX_UP}" } spcd_banner_split() { spcd_banner_append \ "${SPCD_BANNER_DOWN_AND_HORIZONTAL}" \ - "${SPCD_VERT}" \ + "${SPCD_BANNER_VERTICAL}" \ "${SPCD_BANNER_UP_AND_HORIZONTAL}" } From bc70510bfc88aba1d76cddcb5a9dcf8e4c2aeb7d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 12:16:26 +0200 Subject: [PATCH 05/21] banner/chars --- spcd/main.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index cafe55f..9eff3f0 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1102,6 +1102,8 @@ SPCD_BANNER_HORIZONTAL="─" SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" SPCD_BANNER_UP_AND_HORIZONTAL="┴" SPCD_BANNER_VERTICAL="│" +SPCD_BANNER_DOWN_AND_LEFT="╮" +SPCD_BANNER_UP_AND_LEFT="╯" spcd_banner() { spcd_banner_unset @@ -1149,7 +1151,10 @@ spcd_banner_append() { } spcd_banner_close() { - spcd_banner_append "╮" "${SPCD_BANNER_VERTICAL}" "╯" + spcd_banner_append \ + "${SPCD_BANNER_DOWN_AND_LEFT}" \ + "${SPCD_BANNER_VERTICAL}" \ + "${SPCD_BANNER_UP_AND_LEFT}" } spcd_banner_echo() { From cb185445421e15cb5719abb15ca09754993f1007 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 14:25:37 +0200 Subject: [PATCH 06/21] banner/chars --- spcd/main.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 9eff3f0..a6d18d9 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1100,6 +1100,8 @@ spcd_fill() { SPCD_BANNER=1 SPCD_BANNER_HORIZONTAL="─" SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" +SPCD_BANNER_DOWN_AND_RIGHT="╭" +SPCD_BANNER_UP_AND_RIGHT="╰" SPCD_BANNER_UP_AND_HORIZONTAL="┴" SPCD_BANNER_VERTICAL="│" SPCD_BANNER_DOWN_AND_LEFT="╮" @@ -1166,7 +1168,9 @@ ${SPCD_BANNER_BOTTOM}" spcd_banner_open() { spcd_banner_append \ - "${SPCD_BOX_DOWN}" "${SPCD_BANNER_VERTICAL}" "${SPCD_BOX_UP}" + "${SPCD_BANNER_DOWN_AND_RIGHT}" \ + "${SPCD_BANNER_VERTICAL}" \ + "${SPCD_BANNER_UP_AND_RIGHT}" } spcd_banner_split() { From 54e396368f095ddbd1947550a92ba4ad23158e02 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 14:36:41 +0200 Subject: [PATCH 07/21] banner/order --- spcd/main.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index a6d18d9..5f7208d 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1098,14 +1098,14 @@ spcd_fill() { # ╰──────────┴────────╯ SPCD_BANNER=1 -SPCD_BANNER_HORIZONTAL="─" SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" -SPCD_BANNER_DOWN_AND_RIGHT="╭" -SPCD_BANNER_UP_AND_RIGHT="╰" -SPCD_BANNER_UP_AND_HORIZONTAL="┴" -SPCD_BANNER_VERTICAL="│" SPCD_BANNER_DOWN_AND_LEFT="╮" +SPCD_BANNER_DOWN_AND_RIGHT="╭" +SPCD_BANNER_HORIZONTAL="─" +SPCD_BANNER_UP_AND_HORIZONTAL="┴" SPCD_BANNER_UP_AND_LEFT="╯" +SPCD_BANNER_UP_AND_RIGHT="╰" +SPCD_BANNER_VERTICAL="│" spcd_banner() { spcd_banner_unset From e74984a6cb45112e7e0542a929af0d5cc0eefafd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 14:59:50 +0200 Subject: [PATCH 08/21] functions/step --- spcd/main.sh | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 5f7208d..d77913f 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -866,6 +866,23 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" "${SPCD_PYTHON_ALIAS}" -m "${spcd_stp__name}" } +# ╭───────────┬──────╮ +# │ functions │ step │ +# ╰───────────┴──────╯ + +spcd_step() { + SPCD_STEP=$((SPCD_STEP + 1)) + SPCD_STEP_TEXT="${*}" + unset SPCD_SUBSTEP SPCD_SUBSTEP_TEXT + spcd_banner +} + +spcd_substep() { + SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) + SPCD_SUBSTEP_TEXT="${*}" + spcd_banner +} + # ╭───────────╮ # │ functions │ # ╰───────────╯ @@ -1016,19 +1033,6 @@ spcd_split() { echo "${SPCD_SPLT}" } -spcd_step() { - SPCD_STEP=$((SPCD_STEP + 1)) - SPCD_STEP_TEXT="${*}" - unset SPCD_SUBSTEP SPCD_SUBSTEP_TEXT - spcd_banner -} - -spcd_substep() { - SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) - SPCD_SUBSTEP_TEXT="${*}" - spcd_banner -} - spcd_write() { spcd_write__file="${1}" spcd_write__text="${2}" @@ -1097,7 +1101,6 @@ spcd_fill() { # │ internal │ banner │ # ╰──────────┴────────╯ -SPCD_BANNER=1 SPCD_BANNER_DOWN_AND_HORIZONTAL="┬" SPCD_BANNER_DOWN_AND_LEFT="╮" SPCD_BANNER_DOWN_AND_RIGHT="╭" @@ -1184,8 +1187,14 @@ spcd_banner_unset() { unset SPCD_BANNER_TOP SPCD_BANNER_MIDDLE SPCD_BANNER_BOTTOM } -# ╭──────────┬─────╮ -# │ internal │ run │ -# ╰──────────┴─────╯ +# ╭──────────┬──────╮ +# │ internal │ step │ +# ╰──────────┴──────╯ + +SPCD_STEP=1 + +# ╭──────────╮ +# │ internal │ +# ╰──────────╯ spcd_main From 8e3d1e493a64ccd47667e5e4b6eb680e385006fb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:03:08 +0200 Subject: [PATCH 09/21] spcd_step_in --- spcd/main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index d77913f..7537f1f 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -877,6 +877,10 @@ spcd_step() { spcd_banner } +spcd_step_in() { + SPCD_STEP=$((SPCD_STEP + 1)) +} + spcd_substep() { SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) SPCD_SUBSTEP_TEXT="${*}" From 1a41e044e6633b6186cea9d76a0eab909404d55d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:03:28 +0200 Subject: [PATCH 10/21] spcd_step_out --- spcd/main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index 7537f1f..e697308 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -881,6 +881,10 @@ spcd_step_in() { SPCD_STEP=$((SPCD_STEP + 1)) } +spcd_step_out() { + SPCD_STEP=$((SPCD_STEP - 1)) +} + spcd_substep() { SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) SPCD_SUBSTEP_TEXT="${*}" From c39a9ba88775cd46f91217169215c828f18b38c4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:04:41 +0200 Subject: [PATCH 11/21] spcd_substep --- spcd/main.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index e697308..b7c2686 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -885,12 +885,6 @@ spcd_step_out() { SPCD_STEP=$((SPCD_STEP - 1)) } -spcd_substep() { - SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) - SPCD_SUBSTEP_TEXT="${*}" - spcd_banner -} - # ╭───────────╮ # │ functions │ # ╰───────────╯ From 195130b14e4181fd8b6c59c622afe684587fa71a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:15:21 +0200 Subject: [PATCH 12/21] step/in,out,wipe --- spcd/main.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index b7c2686..66bd060 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -871,17 +871,19 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # ╰───────────┴──────╯ spcd_step() { - SPCD_STEP=$((SPCD_STEP + 1)) - SPCD_STEP_TEXT="${*}" - unset SPCD_SUBSTEP SPCD_SUBSTEP_TEXT - spcd_banner + if [ -n "${1}" ]; then + eval "SPCD_STEP_${SPCD_STEP}=\"${1}\"" + spcd_banner + fi } spcd_step_in() { SPCD_STEP=$((SPCD_STEP + 1)) + spcd_step_wipe } spcd_step_out() { + spcd_step_wipe SPCD_STEP=$((SPCD_STEP - 1)) } @@ -1195,6 +1197,10 @@ spcd_banner_unset() { SPCD_STEP=1 +spcd_step_wipe() { + eval "unset SPCD_STEP_${SPCD_STEP}" +} + # ╭──────────╮ # │ internal │ # ╰──────────╯ From 8875d08a2eb873ac1ef10d46c23145149b80cf6c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:17:25 +0200 Subject: [PATCH 13/21] banner/unset --- spcd/main.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 66bd060..1290ed0 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1188,7 +1188,10 @@ spcd_banner_split() { } spcd_banner_unset() { - unset SPCD_BANNER_TOP SPCD_BANNER_MIDDLE SPCD_BANNER_BOTTOM + unset \ + SPCD_BANNER_TOP \ + SPCD_BANNER_MIDDLE \ + SPCD_BANNER_BOTTOM } # ╭──────────┬──────╮ From 76937bc1bfcff03d6a125cf682f4c7b2f3e5331b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:48:00 +0200 Subject: [PATCH 14/21] step/level,index,label --- spcd/main.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 1290ed0..342f804 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -872,19 +872,22 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" spcd_step() { if [ -n "${1}" ]; then - eval "SPCD_STEP_${SPCD_STEP}=\"${1}\"" + spcd_step__prefix="SPCD_STEP_${SPCD_STEP_LEVEL}" + spcd_step__index="${spcd_step__prefix}_INDEX" + eval "${spcd_step__index}=$((${spcd_step__index} + 1))" + eval "${spcd_step__prefix}_LABEL=\"${1}\"" spcd_banner fi } spcd_step_in() { - SPCD_STEP=$((SPCD_STEP + 1)) + SPCD_STEP_LEVEL=$((SPCD_STEP_LEVEL + 1)) spcd_step_wipe } spcd_step_out() { spcd_step_wipe - SPCD_STEP=$((SPCD_STEP - 1)) + SPCD_STEP_LEVEL=$((SPCD_STEP_LEVEL - 1)) } # ╭───────────╮ @@ -1201,7 +1204,9 @@ spcd_banner_unset() { SPCD_STEP=1 spcd_step_wipe() { - eval "unset SPCD_STEP_${SPCD_STEP}" + unset \ + "SPCD_STEP_${SPCD_STEP_LEVEL}_INDEX" \ + "SPCD_STEP_${SPCD_STEP_LEVEL}_LABEL" } # ╭──────────╮ From 2500654681683f9ef8b0b78dd9f14a38981dd87a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 15:56:33 +0200 Subject: [PATCH 15/21] step/escape --- spcd/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 342f804..cb95842 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -874,7 +874,7 @@ spcd_step() { if [ -n "${1}" ]; then spcd_step__prefix="SPCD_STEP_${SPCD_STEP_LEVEL}" spcd_step__index="${spcd_step__prefix}_INDEX" - eval "${spcd_step__index}=$((${spcd_step__index} + 1))" + eval "${spcd_step__index}=\$((${spcd_step__index} + 1))" eval "${spcd_step__prefix}_LABEL=\"${1}\"" spcd_banner fi From 619b3743370997fbfbdd84a32883ba3de90571ac Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 16:08:12 +0200 Subject: [PATCH 16/21] spcd_banner_add/open,split --- spcd/main.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index cb95842..c3cab20 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1119,25 +1119,21 @@ SPCD_BANNER_VERTICAL="│" spcd_banner() { spcd_banner_unset - spcd_banner_open # spcd_banner__index="${SPCD_STEP}" [ -n "${SPCD_SUBSTEP}" ] && spcd_banner__index="${spcd_banner__index}.${SPCD_SUBSTEP}" spcd_banner_add "${spcd_banner__index}" # - spcd_banner_split spcd_banner_add "S" # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do if [ -n "${spcd_banner__item}" ]; then - spcd_banner_split spcd_banner_add "${spcd_banner__item}" fi done # spcd_banner_close - # spcd_banner_echo spcd_banner_unset } @@ -1149,6 +1145,11 @@ spcd_banner_add() { spcd_ba__filler="$( spcd_fill "${spcd_ba__length}" "${SPCD_BANNER_HORIZONTAL}" )" + if [ -n "${SPCD_BANNER_MIDDLE}" ]; then + spcd_banner_split + else + spcd_banner_open + fi spcd_banner_append \ "${spcd_ba__filler}" "${spcd_ba__text}" "${spcd_ba__filler}" fi From b4a2a647cd17a1c53cc87793c8f2648391bcb8f8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 17:04:34 +0200 Subject: [PATCH 17/21] spcd_banner_index --- spcd/main.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index c3cab20..7b1babb 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1177,6 +1177,22 @@ ${SPCD_BANNER_MIDDLE} ${SPCD_BANNER_BOTTOM}" } +spcd_banner_index() { + unset spcd_bi__label + unset spcd_bi__level + while true; do + spcd_bi__level=$((spcd_bi__level + 1)) + eval "spcd_bi__value=\"\${SPCD_BANNER_${spcd_bi__level}_INDEX}\"" + [ -n "${spcd_bi__value}" ] || break + if [ -n "${spcd_bi__label}" ]; then + spcd_bi__label="${spcd_bi__label}.${spcd_bi__value}" + else + spcd_bi__label="${spcd_bi__value}" + fi + done + echo "${spcd_bi__label}" +} + spcd_banner_open() { spcd_banner_append \ "${SPCD_BANNER_DOWN_AND_RIGHT}" \ From eb843769dd08fc74f1618b8eca2ab4bac2ea9331 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 17:06:30 +0200 Subject: [PATCH 18/21] banner/index --- spcd/main.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 7b1babb..cd882c2 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1119,12 +1119,7 @@ SPCD_BANNER_VERTICAL="│" spcd_banner() { spcd_banner_unset - # - spcd_banner__index="${SPCD_STEP}" - [ -n "${SPCD_SUBSTEP}" ] && - spcd_banner__index="${spcd_banner__index}.${SPCD_SUBSTEP}" - spcd_banner_add "${spcd_banner__index}" - # + spcd_banner_add "$(spcd_banner_index)" spcd_banner_add "S" # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do From 30e4f3c75d5c9417fcda02343210f1e2a8b44acf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 17:10:26 +0200 Subject: [PATCH 19/21] spcd_banner_add_index --- spcd/main.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index cd882c2..2b1991d 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1119,7 +1119,7 @@ SPCD_BANNER_VERTICAL="│" spcd_banner() { spcd_banner_unset - spcd_banner_add "$(spcd_banner_index)" + spcd_banner_add_index spcd_banner_add "S" # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do @@ -1150,6 +1150,22 @@ spcd_banner_add() { fi } +spcd_banner_add_index() { + unset spcd_bi__label + unset spcd_bi__level + while true; do + spcd_bi__level=$((spcd_bi__level + 1)) + eval "spcd_bi__value=\"\${SPCD_BANNER_${spcd_bi__level}_INDEX}\"" + [ -n "${spcd_bi__value}" ] || break + if [ -n "${spcd_bi__label}" ]; then + spcd_bi__label="${spcd_bi__label}.${spcd_bi__value}" + else + spcd_bi__label="${spcd_bi__value}" + fi + done + spcd_banner_add "${spcd_bi__label}" +} + spcd_banner_append() { if [ -n "${3}" ]; then SPCD_BANNER_TOP="${SPCD_BANNER_TOP}${1}" @@ -1172,22 +1188,6 @@ ${SPCD_BANNER_MIDDLE} ${SPCD_BANNER_BOTTOM}" } -spcd_banner_index() { - unset spcd_bi__label - unset spcd_bi__level - while true; do - spcd_bi__level=$((spcd_bi__level + 1)) - eval "spcd_bi__value=\"\${SPCD_BANNER_${spcd_bi__level}_INDEX}\"" - [ -n "${spcd_bi__value}" ] || break - if [ -n "${spcd_bi__label}" ]; then - spcd_bi__label="${spcd_bi__label}.${spcd_bi__value}" - else - spcd_bi__label="${spcd_bi__value}" - fi - done - echo "${spcd_bi__label}" -} - spcd_banner_open() { spcd_banner_append \ "${SPCD_BANNER_DOWN_AND_RIGHT}" \ From a6bbad3f8643a0cfc98b525a7eb3eeebbe96eb34 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 17:14:42 +0200 Subject: [PATCH 20/21] spcd_banner_render --- spcd/main.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 2b1991d..13f010e 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -876,7 +876,7 @@ spcd_step() { spcd_step__index="${spcd_step__prefix}_INDEX" eval "${spcd_step__index}=\$((${spcd_step__index} + 1))" eval "${spcd_step__prefix}_LABEL=\"${1}\"" - spcd_banner + spcd_banner_render fi } @@ -1117,22 +1117,6 @@ SPCD_BANNER_UP_AND_LEFT="╯" SPCD_BANNER_UP_AND_RIGHT="╰" SPCD_BANNER_VERTICAL="│" -spcd_banner() { - spcd_banner_unset - spcd_banner_add_index - spcd_banner_add "S" - # - for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do - if [ -n "${spcd_banner__item}" ]; then - spcd_banner_add "${spcd_banner__item}" - fi - done - # - spcd_banner_close - spcd_banner_echo - spcd_banner_unset -} - spcd_banner_add() { if [ -n "${1}" ]; then spcd_ba__text=" ${1} " @@ -1195,6 +1179,22 @@ spcd_banner_open() { "${SPCD_BANNER_UP_AND_RIGHT}" } +spcd_banner_render() { + spcd_banner_unset + spcd_banner_add_index + spcd_banner_add "S" + # + for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do + if [ -n "${spcd_banner__item}" ]; then + spcd_banner_add "${spcd_banner__item}" + fi + done + # + spcd_banner_close + spcd_banner_echo + spcd_banner_unset +} + spcd_banner_split() { spcd_banner_append \ "${SPCD_BANNER_DOWN_AND_HORIZONTAL}" \ From 2ac2c86d2c1a29496e90c2a1973addd79b53aa27 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 25 Aug 2024 17:19:31 +0200 Subject: [PATCH 21/21] spcd_banner_render/loop --- spcd/main.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 13f010e..0835f1e 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1184,10 +1184,12 @@ spcd_banner_render() { spcd_banner_add_index spcd_banner_add "S" # - for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do - if [ -n "${spcd_banner__item}" ]; then - spcd_banner_add "${spcd_banner__item}" - fi + unset spcd_br__level + while true; do + spcd_br__level=$((spcd_br__level + 1)) + eval "spcd_br__value=\"\${SPCD_BANNER_${spcd_br__level}_LABEL}\"" + [ -n "${spcd_br__value}" ] || break + spcd_banner_add "${spcd_br__value}" done # spcd_banner_close