From 6dcdf960c77a0493f5bc7a98e58669751900fe2a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 19:58:35 +0200 Subject: [PATCH 1/7] spcd_fill --- spcd/main.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index 1e7f9d2..d4ce405 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -865,6 +865,14 @@ spcd_error_os() { exit "${SPCD_ERROR_OS}" } +spcd_fill() { + spcd_fill__index=${1} + while [ ${spcd_fill__index} -gt 0 ]; do + printf "${2}" + spcd_fill__index=$((spcd_fill__index - 1)) + done +} + spcd_git_clone() { if [ -n "${1}" ]; then spcd_gc__name="$(basename "${1}")" From f4ee63aab7052d4abde4e6047a082891d2b0381f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 21:10:11 +0200 Subject: [PATCH 2/7] git clone --- spcd/main.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index d4ce405..41e267f 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -878,9 +878,7 @@ spcd_git_clone() { spcd_gc__name="$(basename "${1}")" spcd_gc__path="${SPCD_DL}/${spcd_gc__name}" spcd_gc__url="$(spcd_git_url "${1}")" - git clone \ - "${spcd_gc__url}" \ - "${spcd_gc__path}" + git clone "${spcd_gc__url}" "${spcd_gc__path}" echo "${spcd_gc__path}" fi } From 55051830acfbcb55f48c1f9cecb22aaad9000dfc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 22:44:21 +0200 Subject: [PATCH 3/7] shellcheck --- spcd/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 41e267f..362d414 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -867,8 +867,8 @@ spcd_error_os() { spcd_fill() { spcd_fill__index=${1} - while [ ${spcd_fill__index} -gt 0 ]; do - printf "${2}" + while [ "${spcd_fill__index}" -gt 0 ]; do + printf "%s" "${2}" spcd_fill__index=$((spcd_fill__index - 1)) done } From 9eb9e69934fa7bc1a7ba60b9788228e9ac6d34f6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 22:48:07 +0200 Subject: [PATCH 4/7] spcd_banner_add --- spcd/main.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 362d414..7b829c6 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -827,11 +827,15 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # functions -spcd_banner() { - echo "\ -${SPCD_DOWN} -${SPCD_VERT} ${*} -${SPCD___UP}" +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_BANNER_1="${SPCD_BANNER_1}${spcd_ba__filler}" + SPCD_BANNER_2="${SPCD_BANNER_2}${spcd_ba__text}" + SPCD_BANNER_3="${SPCD_BANNER_3}${spcd_ba__filler}" + fi } spcd_cat() { From f3d5b5c46435e992afc3b4a58efc7f614f33f178 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 23:03:18 +0200 Subject: [PATCH 5/7] spcd_banner_add_123 --- spcd/main.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 7b829c6..a816a7f 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -832,9 +832,16 @@ spcd_banner_add() { spcd_ba__text=" ${1} " spcd_ba__length=${#spcd_ba__text} spcd_ba__filler="$(spcd_fill "${spcd_ba__length}" ─)" - SPCD_BANNER_1="${SPCD_BANNER_1}${spcd_ba__filler}" - SPCD_BANNER_2="${SPCD_BANNER_2}${spcd_ba__text}" - SPCD_BANNER_3="${SPCD_BANNER_3}${spcd_ba__filler}" + spcd_banner_add_123 \ + "${spcd_ba__filler}" "${spcd_ba__text}" "${spcd_ba__filler}" + fi +} + +spcd_banner_add_123() { + 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}" fi } From 1c1813148b8ea57a2852322260469f6f5190d676 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 23:06:10 +0200 Subject: [PATCH 6/7] spcd_banner --- spcd/main.sh | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index a816a7f..4042412 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -827,6 +827,23 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # functions +spcd_banner() { + unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 + spcd_banner_add_123 "${SPCD_DOWN}" "${SPCD_VERT}" "${SPCD___UP}" + # + spcd_banner__index="${SPCD_STEP}" + [ -n "${SPCD_SUBSTEP}" ] && + spcd_banner__index="${spcd_banner__index}.${SPCD_SUBSTEP}" + spcd_banner_add "${spcd_banner__index}" + # + for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do + spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" + spcd_banner_add "${spcd_banner__item}" + done + # + spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" +} + spcd_banner_add() { if [ -n "${1}" ]; then spcd_ba__text=" ${1} " @@ -1002,18 +1019,14 @@ spcd_split() { spcd_step() { SPCD_STEP=$((SPCD_STEP + 1)) SPCD_STEP_TEXT="${*}" - unset SPCD_SUBSTEP - spcd_banner "${SPCD_STEP}" "${SPCD_VERT}" "${SPCD_STEP_TEXT}" + unset SPCD_SUBSTEP SPCD_SUBSTEP_TEXT + spcd_banner } spcd_substep() { SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1)) - spcd_banner \ - "${SPCD_STEP}.${SPCD_SUBSTEP}" \ - "${SPCD_VERT}" \ - "${SPCD_STEP_TEXT}" \ - "${SPCD_VERT}" \ - "${*}" + SPCD_SUBSTEP_TEXT="${*}" + spcd_banner } spcd_write() { From c0d42e6208b9c0daf864a29eadcfcb86fb3f619f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 23 Aug 2024 23:07:28 +0200 Subject: [PATCH 7/7] readme/banner --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 08f857f..8e85647 100644 --- a/readme.md +++ b/readme.md @@ -213,8 +213,8 @@ Handle project workflows in a unified way: ### Shell +* banner with constants for characters * comment -* fit banner to text * review repositories handling for systems * opensuse * codecs repository