From d587944e95a22f91414c1f0d2d5e084ccd502d6f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 12:08:30 +0200 Subject: [PATCH 01/21] spcd_banner_split --- spcd/main.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 9980062..cdaec4e 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -838,7 +838,7 @@ spcd_banner() { # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do if [ -n "${spcd_banner__item}" ]; then - spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" + spcd_banner_split spcd_banner_add "${spcd_banner__item}" fi done @@ -869,6 +869,10 @@ spcd_banner_add_123() { fi } +spcd_banner_split() { + spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" +} + spcd_cat() { spcd_cat__file="${1}" if [ -n "${spcd_cat__file}" ]; then From f7ae3796d92711420b36360fe896c17ae3ce794f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 12:09:33 +0200 Subject: [PATCH 02/21] spcd_banner_close --- spcd/main.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index cdaec4e..cb2e6f0 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -843,7 +843,7 @@ spcd_banner() { fi done # - spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" + spcd_banner_close # echo "\ ${SPCD_BANNER_1} @@ -869,6 +869,10 @@ spcd_banner_add_123() { fi } +spcd_banner_close() { + spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" +} + spcd_banner_split() { spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" } From 37668ac48868ed40f472005f978a0094f9355d2f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 12:14:22 +0200 Subject: [PATCH 03/21] spcd_banner_open --- spcd/main.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index cb2e6f0..9b8769b 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -828,8 +828,7 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # functions spcd_banner() { - unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 - spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" + spcd_banner_open # spcd_banner__index="${SPCD_STEP}" [ -n "${SPCD_SUBSTEP}" ] && @@ -873,6 +872,11 @@ spcd_banner_close() { spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" } +spcd_banner_open() { + unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 + spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" +} + spcd_banner_split() { spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" } From 89998d8a65d54d85437ea44240725fb632bc69e1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 12:16:43 +0200 Subject: [PATCH 04/21] spcd_banner_wipe --- spcd/main.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 9b8769b..80d6e05 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -828,6 +828,7 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # functions spcd_banner() { + spcd_banner_wipe spcd_banner_open # spcd_banner__index="${SPCD_STEP}" @@ -848,6 +849,7 @@ spcd_banner() { ${SPCD_BANNER_1} ${SPCD_BANNER_2} ${SPCD_BANNER_3}" + spcd_banner_wipe } spcd_banner_add() { @@ -873,7 +875,6 @@ spcd_banner_close() { } spcd_banner_open() { - unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" } @@ -881,6 +882,10 @@ spcd_banner_split() { spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" } +spcd_banner_wipe() { + unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 +} + spcd_cat() { spcd_cat__file="${1}" if [ -n "${spcd_cat__file}" ]; then From 3784d4d6a604457ee88c2f921b58f24ab10ef031 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 12:27:25 +0200 Subject: [PATCH 05/21] purge --- spcd/main.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 80d6e05..81f5556 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1101,10 +1101,8 @@ SPCD_PYTHON_VENV_BINARIES="${SPCD_PYTHON_VENV}/bin" SPCD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈" SPCD_OPEN="${SPCD_BOX_DOWN}${SPCD_BOX_LEFT}" -SPCD_DOWN="${SPCD_BOX_DOWN}${SPCD_HORIZONTAL}" SPCD_VERT="${SPCD_BOX_VERTICAL}" SPCD_SPLT="${SPCD_BOX_RIGHT}${SPCD_HORIZONTAL}" -SPCD___UP="${SPCD_BOX_UP}${SPCD_HORIZONTAL}" SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" # run From b2e3a5db4cfd96117c0c093e7b86839010a167d5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:00:25 +0200 Subject: [PATCH 06/21] mv --- spcd/main.sh | 121 ++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 81f5556..f0571a9 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -827,65 +827,6 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # functions -spcd_banner() { - spcd_banner_wipe - 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}" - # - 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 - # - echo "\ -${SPCD_BANNER_1} -${SPCD_BANNER_2} -${SPCD_BANNER_3}" - spcd_banner_wipe -} - -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_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 -} - -spcd_banner_close() { - spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" -} - -spcd_banner_open() { - spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" -} - -spcd_banner_split() { - spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" -} - -spcd_banner_wipe() { - unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 -} - spcd_cat() { spcd_cat__file="${1}" if [ -n "${spcd_cat__file}" ]; then @@ -1105,5 +1046,67 @@ SPCD_VERT="${SPCD_BOX_VERTICAL}" SPCD_SPLT="${SPCD_BOX_RIGHT}${SPCD_HORIZONTAL}" SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" +# log + +spcd_banner() { + spcd_banner_wipe + 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}" + # + 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 + # + echo "\ +${SPCD_BANNER_1} +${SPCD_BANNER_2} +${SPCD_BANNER_3}" + spcd_banner_wipe +} + +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_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 +} + +spcd_banner_close() { + spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" +} + +spcd_banner_open() { + spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" +} + +spcd_banner_split() { + spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" +} + +spcd_banner_wipe() { + unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 +} + # run + spcd_main From 517b5b0f685fd00270da1038c50ee1facd9b9e58 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:04:49 +0200 Subject: [PATCH 07/21] spcd_banner_echo --- spcd/main.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index f0571a9..dcc5cc0 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1066,10 +1066,7 @@ spcd_banner() { # spcd_banner_close # - echo "\ -${SPCD_BANNER_1} -${SPCD_BANNER_2} -${SPCD_BANNER_3}" + spcd_banner_echo spcd_banner_wipe } @@ -1095,6 +1092,13 @@ spcd_banner_close() { spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" } +spcd_banner_echo() { + echo "\ +${SPCD_BANNER_1} +${SPCD_BANNER_2} +${SPCD_BANNER_3}" +} + spcd_banner_open() { spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" } From e87d66c3a9d2fd67184f69a5f938d5d425b53bf6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:05:37 +0200 Subject: [PATCH 08/21] spcd_banner_unset --- spcd/main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index dcc5cc0..07bc1d5 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1049,7 +1049,7 @@ SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" # log spcd_banner() { - spcd_banner_wipe + spcd_banner_unset spcd_banner_open # spcd_banner__index="${SPCD_STEP}" @@ -1067,7 +1067,7 @@ spcd_banner() { spcd_banner_close # spcd_banner_echo - spcd_banner_wipe + spcd_banner_unset } spcd_banner_add() { @@ -1107,7 +1107,7 @@ spcd_banner_split() { spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" } -spcd_banner_wipe() { +spcd_banner_unset() { unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 } From f1f5004e2a5c2bde62111260afa8166de6e8a47f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:08:10 +0200 Subject: [PATCH 09/21] spcd_banner_append --- spcd/main.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 07bc1d5..d7b6a34 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1075,12 +1075,12 @@ spcd_banner_add() { spcd_ba__text=" ${1} " spcd_ba__length=${#spcd_ba__text} spcd_ba__filler="$(spcd_fill "${spcd_ba__length}" ─)" - spcd_banner_add_123 \ + spcd_banner_append \ "${spcd_ba__filler}" "${spcd_ba__text}" "${spcd_ba__filler}" fi } -spcd_banner_add_123() { +spcd_banner_append() { if [ -n "${3}" ]; then SPCD_BANNER_1="${SPCD_BANNER_1}${1}" SPCD_BANNER_2="${SPCD_BANNER_2}${2}" @@ -1089,7 +1089,7 @@ spcd_banner_add_123() { } spcd_banner_close() { - spcd_banner_add_123 "╮" "${SPCD_VERT}" "╯" + spcd_banner_append "╮" "${SPCD_VERT}" "╯" } spcd_banner_echo() { @@ -1100,11 +1100,11 @@ ${SPCD_BANNER_3}" } spcd_banner_open() { - spcd_banner_add_123 "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" + spcd_banner_append "${SPCD_BOX_DOWN}" "${SPCD_VERT}" "${SPCD_BOX_UP}" } spcd_banner_split() { - spcd_banner_add_123 "┬" "${SPCD_VERT}" "┴" + spcd_banner_append "┬" "${SPCD_VERT}" "┴" } spcd_banner_unset() { From 5604fb2be7dc07df5b160088242bab72d46b9bca Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:14:55 +0200 Subject: [PATCH 10/21] spcd_banner_add --- spcd/main.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index d7b6a34..3aa7914 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1058,10 +1058,8 @@ spcd_banner() { spcd_banner_add "${spcd_banner__index}" # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do - if [ -n "${spcd_banner__item}" ]; then - spcd_banner_split + [ -n "${spcd_banner__item}" ] && spcd_banner_add "${spcd_banner__item}" - fi done # spcd_banner_close @@ -1075,6 +1073,7 @@ spcd_banner_add() { spcd_ba__text=" ${1} " spcd_ba__length=${#spcd_ba__text} spcd_ba__filler="$(spcd_fill "${spcd_ba__length}" ─)" + spcd_banner_split spcd_banner_append \ "${spcd_ba__filler}" "${spcd_ba__text}" "${spcd_ba__filler}" fi From 4be8512ffc5df0a9f4b89255380d12452b95189d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 13:15:06 +0200 Subject: [PATCH 11/21] banner/s --- spcd/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index 3aa7914..55c356a 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1057,6 +1057,8 @@ spcd_banner() { spcd_banner__index="${spcd_banner__index}.${SPCD_SUBSTEP}" spcd_banner_add "${spcd_banner__index}" # + spcd_banner_add "S" + # for spcd_banner__item in "${SPCD_STEP_TEXT}" "${SPCD_SUBSTEP_TEXT}"; do [ -n "${spcd_banner__item}" ] && spcd_banner_add "${spcd_banner__item}" From 5dd39bc1cbf9b43b8e2d051843e050b6f2e6e95a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 15:12:13 +0200 Subject: [PATCH 12/21] refs --- spcd/main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 55c356a..ab47ae4 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1,14 +1,14 @@ #! /usr/bin/env sh # defaults -[ -n "${SPCD_BRANCH_RELEASE}" ] || SPCD_BRANCH_RELEASE="main" -[ -n "${SPCD_BRANCH_STAGING}" ] || SPCD_BRANCH_STAGING="dev" -[ -n "${SPCD_BRANCH_FEATURE}" ] || SPCD_BRANCH_FEATURE="f" [ -n "${SPCD_CMD_SUM}" ] || SPCD_CMD_SUM="sha512sum" [ -n "${SPCD_DNS_1}" ] || SPCD_DNS_1="9.9.9.9" [ -n "${SPCD_GIT_MAIN}" ] || SPCD_GIT_MAIN="spcd" [ -n "${SPCD_GIT_ROOT}" ] || SPCD_GIT_ROOT="rwx" [ -n "${SPCD_GIT_SHUNIT}" ] || SPCD_GIT_SHUNIT="shunit2" +[ -n "${SPCD_REF_FEATURE}" ] || SPCD_REF_FEATURE="f" +[ -n "${SPCD_REF_RELEASE}" ] || SPCD_REF_RELEASE="main" +[ -n "${SPCD_REF_STAGING}" ] || SPCD_REF_STAGING="dev" [ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/simple" # main From 56339168954db9208690546fb128cd802df86f75 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:10:36 +0200 Subject: [PATCH 13/21] refs --- spcd/main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index ab47ae4..2d486e2 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -121,9 +121,9 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" fi # check project variables case "${SPCD_PROJECT_BRANCH}" in - "${SPCD_BRANCH_RELEASE}" | \ - "${SPCD_BRANCH_STAGING}" | \ - "${SPCD_BRANCH_FEATURE}") ;; + "${SPCD_REF_RELEASE}" | \ + "${SPCD_REF_STAGING}" | \ + "${SPCD_REF_FEATURE}") ;; *) spcd_error_ci "SPCD_PROJECT_BRANCH" ;; esac [ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT" From 6fd8e23029c2d3c3537eb3e4e43a617e49d7b716 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:11:41 +0200 Subject: [PATCH 14/21] urls --- spcd/main.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 2d486e2..51f3814 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -9,7 +9,24 @@ [ -n "${SPCD_REF_FEATURE}" ] || SPCD_REF_FEATURE="f" [ -n "${SPCD_REF_RELEASE}" ] || SPCD_REF_RELEASE="main" [ -n "${SPCD_REF_STAGING}" ] || SPCD_REF_STAGING="dev" -[ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/simple" +[ -n "${SPCD_URL_ALPINE}" ] || + SPCD_URL_ALPINE="https://dl-cdn.alpinelinux.org" +[ -n "${SPCD_URL_ARCH}" ] || + SPCD_URL_ARCH="https://geo.mirror.pkgbuild.com" +[ -n "${SPCD_URL_DEBIAN}" ] || + SPCD_URL_DEBIAN="https://deb.debian.org" +[ -n "${SPCD_URL_EPEL}" ] || + SPCD_URL_EPEL="https://dl.fedoraproject.org" +[ -n "${SPCD_URL_FEDORA}" ] || + SPCD_URL_FEDORA="https://rpmfind.net" +[ -n "${SPCD_URL_OPENSUSE}" ] || + SPCD_URL_OPENSUSE="https://download.opensuse.org" +[ -n "${SPCD_URL_PYTHON}" ] || + SPCD_URL_PYTHON="https://pypi.org/simple" +[ -n "${SPCD_URL_ROCKY}" ] || + SPCD_URL_ROCKY="https://dl.rockylinux.org" +[ -n "${SPCD_URL_UBUNTU}" ] || + SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net" # main spcd_main() { From 31a0b4d2572690e4c747ca2ddc61a7c8e9e68172 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:20:05 +0200 Subject: [PATCH 15/21] internal --- spcd/main.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 51f3814..ed9dc24 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1063,7 +1063,9 @@ SPCD_VERT="${SPCD_BOX_VERTICAL}" SPCD_SPLT="${SPCD_BOX_RIGHT}${SPCD_HORIZONTAL}" SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" -# log +# ╭──────────╮ +# │ internal │ +# ╰──────────╯ spcd_banner() { spcd_banner_unset From 35123c72c156984d12031e2cb4b09eceb2d156c1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:32:20 +0200 Subject: [PATCH 16/21] internal/banner,run --- spcd/main.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index ed9dc24..7c22bba 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -1067,6 +1067,10 @@ SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" # │ internal │ # ╰──────────╯ +# ╭──────────┬────────╮ +# │ internal │ banner │ +# ╰──────────┴────────╯ + spcd_banner() { spcd_banner_unset spcd_banner_open @@ -1131,6 +1135,8 @@ spcd_banner_unset() { unset SPCD_BANNER_1 SPCD_BANNER_2 SPCD_BANNER_3 } -# run +# ╭──────────┬─────╮ +# │ internal │ run │ +# ╰──────────┴─────╯ spcd_main From 21b91211ecc0ad15bf3d9af572bcf4809e7ab151 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:35:32 +0200 Subject: [PATCH 17/21] spcd_fill --- spcd/main.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 7c22bba..cd1bc70 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -875,14 +875,6 @@ spcd_error_os() { exit "${SPCD_ERROR_OS}" } -spcd_fill() { - spcd_fill__index=${1} - while [ "${spcd_fill__index}" -gt 0 ]; do - printf "%s" "${2}" - spcd_fill__index=$((spcd_fill__index - 1)) - done -} - spcd_git_clone() { if [ -n "${1}" ]; then spcd_gc__name="$(basename "${1}")" @@ -1067,6 +1059,14 @@ SPCD_SHUT="${SPCD_BOX_UP}${SPCD_BOX_LEFT}" # │ internal │ # ╰──────────╯ +spcd_fill() { + spcd_fill__index=${1} + while [ "${spcd_fill__index}" -gt 0 ]; do + printf "%s" "${2}" + spcd_fill__index=$((spcd_fill__index - 1)) + done +} + # ╭──────────┬────────╮ # │ internal │ banner │ # ╰──────────┴────────╯ From d7d6f37648290e36d2cbba8cffffe24d1066fae2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:40:19 +0200 Subject: [PATCH 18/21] functions --- spcd/main.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index cd1bc70..75e21fb 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -842,7 +842,9 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" "${SPCD_PYTHON_ALIAS}" -m "${spcd_stp__name}" } -# functions +# ╭───────────╮ +# │ functions │ +# ╰───────────╯ spcd_cat() { spcd_cat__file="${1}" From ba4b428edefc84362adbffc252ca1db9c1528f0f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:40:59 +0200 Subject: [PATCH 19/21] steps --- spcd/main.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spcd/main.sh b/spcd/main.sh index 75e21fb..710b86a 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -56,7 +56,9 @@ spcd_main() { spcd_switch_to_python } -# steps +# ╭───────╮ +# │ steps │ +# ╰───────╯ spcd_set_environment_variables() { spcd_step "Set environment variables" From a014410c7f17eb24d05b068a0c100380c60f97d6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 16:54:07 +0200 Subject: [PATCH 20/21] steps/env,pkg --- spcd/main.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/spcd/main.sh b/spcd/main.sh index 710b86a..658601c 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -28,12 +28,15 @@ [ -n "${SPCD_URL_UBUNTU}" ] || SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net" -# main +# ╭───────╮ +# │ steps │ +# ╰───────╯ + spcd_main() { + # env spcd_set_environment_variables - # spcd_list_working_directory - # + # pkg spcd_set_packages_repositories spcd_set_packages_configuration # @@ -56,9 +59,9 @@ spcd_main() { spcd_switch_to_python } -# ╭───────╮ -# │ steps │ -# ╰───────╯ +# ╭───────┬─────╮ +# │ steps │ env │ +# ╰───────┴─────╯ spcd_set_environment_variables() { spcd_step "Set environment variables" @@ -547,6 +550,10 @@ spcd_list_working_directory() { spcd_ls "${spcd_lwd__path}" } +# ╭───────┬─────╮ +# │ steps │ pkg │ +# ╰───────┴─────╯ + spcd_set_packages_repositories() { spcd_step "Set packages repositories" case "${SPCD_OS_ID}" in From 70eaf4bba3b050471f2f73f3f100002b15c86882 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 24 Aug 2024 17:11:03 +0200 Subject: [PATCH 21/21] steps/ca,pkg,python --- spcd/main.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spcd/main.sh b/spcd/main.sh index 658601c..e141214 100644 --- a/spcd/main.sh +++ b/spcd/main.sh @@ -44,14 +44,17 @@ spcd_main() { spcd_set_dns_resolving spcd_update_packages_catalog spcd_install_packages_tools + # ca spcd_install_ca_certificates spcd_write_ca_certificates spcd_update_ca_certificates + # pkg spcd_set_https_verification_on spcd_update_packages_catalog spcd_upgrade_packages spcd_install_dos2unix spcd_install_git + # python spcd_install_python spcd_install_python_modules spcd_install_packages @@ -668,6 +671,10 @@ spcd_install_packages_tools() { spcd_install_package "${SPCD_PKG_PKG}" } +# ╭───────┬────╮ +# │ steps │ ca │ +# ╰───────┴────╯ + spcd_install_ca_certificates() { spcd_step "Install CA" spcd_install_package "${SPCD_PKG_CA}" @@ -692,6 +699,10 @@ spcd_update_ca_certificates() { ${SPCD_CMD_CA} || exit } +# ╭───────┬─────╮ +# │ steps │ pkg │ +# ╰───────┴─────╯ + spcd_set_https_verification_on() { spcd_step "Set HTTPS verification on" spcd_rm "${SPCD_PM_HTTPS_PATH}" @@ -712,6 +723,10 @@ spcd_install_git() { spcd_install_package "${SPCD_PKG_GIT}" } +# ╭───────┬────────╮ +# │ steps │ python │ +# ╰───────┴────────╯ + spcd_install_python() { spcd_step "Install Python" spcd_install_package "${SPCD_PYTHON_PACKAGE}"