From 11c144c7c33d36a6e23100c1714060823ec6d2db Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 21:20:13 +0200 Subject: [PATCH 01/44] locale/show --- readme.md | 1 - spcd/bootstrap.sh | 62 +++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/readme.md b/readme.md index c028469..42e91ea 100644 --- a/readme.md +++ b/readme.md @@ -239,7 +239,6 @@ Handle project workflows in a unified way: * locales * persist * restrict LC_* variables set for alpine - * test LC_* variables * test #### Shell → Python diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 616a705..4155628 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -915,6 +915,31 @@ spcd_txt_locale() { spcd_split spcd_txt_locale "list" ;; + "show") + local regex + for name in "${@}"; do + case "${name}" in + # LC_CTYPE + "LC_NUMERIC") regex="^\(decimal\|thousands\|grouping\)" ;; + "LC_TIME") regex="^\(day\|mon\)" ;; + # LC_COLLATE + "LC_MONETARY") regex="^\(int_curr\|currency\|mon_\)" ;; + "LC_MESSAGES") regex="^\(yes\|no\)" ;; + "LC_PAPER") regex="^\(height\|width\)" ;; + "LC_NAME") regex="^name_m" ;; + "LC_ADDRESS") regex="^\(country\|lang\)_name" ;; + "LC_TELEPHONE") regex="^int_" ;; + "LC_MEASUREMENT") regex="^measurement=" ;; + "LC_IDENTIFICATION") regex="^\(language\|territory\|title\)" ;; + *) ;; + esac + spcd_split + echo "${name}" + if [ -n "${regex}" ]; then + locale --keyword-name "${name}" | grep "${regex}" + fi + done + ;; *) ;; esac } @@ -1231,41 +1256,8 @@ spcd_step__packages_install_locales() { spcd_txt_locales "install" spcd_step "Set" spcd_txt_locale "set" "${SPCD_TXT_LOCALE}" - spcd_step "Test" - # CTYPE - # NUMERIC - spcd_split - locale --keyword-name LC_NUMERIC | grep "^\(decimal\|thousands\|grouping\)" - # TIME - spcd_split - locale --keyword-name LC_TIME | grep "^\(day\|mon\)" - # COLLATE - # MONETARY - spcd_split - locale --keyword-name LC_MONETARY | grep "^\(int_curr\|currency\|mon_\)" - # MESSAGES - spcd_split - locale --keyword-name LC_MESSAGES | grep "^\(yes\|no\)" - # - # PAPER - spcd_split - locale --keyword-name LC_PAPER | grep "^\(height\|width\)" - # NAME - spcd_split - locale --keyword-name LC_NAME | grep "^name_m" - # ADDRESS - spcd_split - locale --keyword-name LC_ADDRESS | grep "^\(country\|lang\)_name" - # TELEPHONE - spcd_split - locale --keyword-name LC_TELEPHONE | grep "^int_" - # MEASUREMENT - spcd_split - locale --keyword-name LC_MEASUREMENT | grep "^measurement=" - # IDENTIFICATION - spcd_split - locale --keyword-name LC_IDENTIFICATION | - grep "^\(language\|territory\|title\)" + spcd_step "Show" + spcd_txt_locale "show" spcd_step_out } From 389f8cc7374eeff1be2a76ee73f117199ee94fdf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 21:22:46 +0200 Subject: [PATCH 02/44] locale/debug --- spcd/bootstrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 4155628..ce0d154 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -887,6 +887,9 @@ spcd_txt_locale() { ;; esac local name + for name in "${@}"; do + echo "${name}" + done case "${action}" in "list") if ! locale; then From 1398431521d7d318226b0077a3c867c7ac741ac6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 21:40:28 +0200 Subject: [PATCH 03/44] indent --- spcd/bootstrap.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index ce0d154..d6453a1 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -922,19 +922,19 @@ spcd_txt_locale() { local regex for name in "${@}"; do case "${name}" in - # LC_CTYPE - "LC_NUMERIC") regex="^\(decimal\|thousands\|grouping\)" ;; - "LC_TIME") regex="^\(day\|mon\)" ;; - # LC_COLLATE - "LC_MONETARY") regex="^\(int_curr\|currency\|mon_\)" ;; - "LC_MESSAGES") regex="^\(yes\|no\)" ;; - "LC_PAPER") regex="^\(height\|width\)" ;; - "LC_NAME") regex="^name_m" ;; - "LC_ADDRESS") regex="^\(country\|lang\)_name" ;; - "LC_TELEPHONE") regex="^int_" ;; - "LC_MEASUREMENT") regex="^measurement=" ;; - "LC_IDENTIFICATION") regex="^\(language\|territory\|title\)" ;; - *) ;; + # LC_CTYPE + "LC_NUMERIC") regex="^\(decimal\|thousands\|grouping\)" ;; + "LC_TIME") regex="^\(day\|mon\)" ;; + # LC_COLLATE + "LC_MONETARY") regex="^\(int_curr\|currency\|mon_\)" ;; + "LC_MESSAGES") regex="^\(yes\|no\)" ;; + "LC_PAPER") regex="^\(height\|width\)" ;; + "LC_NAME") regex="^name_m" ;; + "LC_ADDRESS") regex="^\(country\|lang\)_name" ;; + "LC_TELEPHONE") regex="^int_" ;; + "LC_MEASUREMENT") regex="^measurement=" ;; + "LC_IDENTIFICATION") regex="^\(language\|territory\|title\)" ;; + *) ;; esac spcd_split echo "${name}" From c64014d61704c4caa5b53f56b56ad59d71754ddc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 21:43:02 +0200 Subject: [PATCH 04/44] unset regex --- spcd/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d6453a1..a3b484a 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -921,6 +921,7 @@ spcd_txt_locale() { "show") local regex for name in "${@}"; do + unset regex case "${name}" in # LC_CTYPE "LC_NUMERIC") regex="^\(decimal\|thousands\|grouping\)" ;; From 74e2335cdb6a06d5294261e0bd79c59e79f9d37f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 22:22:14 +0200 Subject: [PATCH 05/44] monetary/alpine --- spcd/bootstrap.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index a3b484a..d621bfe 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -887,9 +887,6 @@ spcd_txt_locale() { ;; esac local name - for name in "${@}"; do - echo "${name}" - done case "${action}" in "list") if ! locale; then @@ -927,7 +924,12 @@ spcd_txt_locale() { "LC_NUMERIC") regex="^\(decimal\|thousands\|grouping\)" ;; "LC_TIME") regex="^\(day\|mon\)" ;; # LC_COLLATE - "LC_MONETARY") regex="^\(int_curr\|currency\|mon_\)" ;; + "LC_MONETARY") + case "${SPCD_OS_ID}" in + "${SPCD_OS_ALPINE}") ;; + *) regex="^\(int_curr\|currency\|mon_\)" ;; + esac + ;; "LC_MESSAGES") regex="^\(yes\|no\)" ;; "LC_PAPER") regex="^\(height\|width\)" ;; "LC_NAME") regex="^name_m" ;; From dd1a9ed807c28f27a9254e1d2297ffde8f2327ae Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 22:31:42 +0200 Subject: [PATCH 06/44] =?UTF-8?q?tasks/=E2=88=92restrict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 42e91ea..47befa6 100644 --- a/readme.md +++ b/readme.md @@ -238,7 +238,6 @@ Handle project workflows in a unified way: * disable & enable https * locales * persist - * restrict LC_* variables set for alpine * test #### Shell → Python From 99720057553ddd701b25c145040e2c33792fe3e4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 23:47:00 +0200 Subject: [PATCH 07/44] spcd_eval --- spcd/bootstrap.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d621bfe..18e53fb 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -247,6 +247,13 @@ nameserver ${value} fi } +spcd_eval() { + if [ -n "${1}" ]; then + echo "${@}" + eval "${@}" + fi +} + # ╭───────────┬───────╮ # │ functions │ error │ # ╰───────────┴───────╯ From 19eee535c56c90214eeef51d94ab77fcf248f849 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 23:49:23 +0200 Subject: [PATCH 08/44] eval/clean,install --- spcd/bootstrap.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 18e53fb..f3e956a 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -783,11 +783,11 @@ spcd_step__environment_list_workspace() { spcd_clean_cache() { case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk cache purge ;; - "${SPCD_PM_APT}") apt-get clean ;; - "${SPCD_PM_DNF}") dnf clean all ;; - "${SPCD_PM_PACMAN}") pacman --sync --clean --noconfirm ;; - "${SPCD_PM_ZYPPER}") zypper clean ;; + "${SPCD_PM_APK}") spcd_eval apk cache purge ;; + "${SPCD_PM_APT}") spcd_eval apt-get clean ;; + "${SPCD_PM_DNF}") spcd_eval dnf clean all ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;; *) ;; esac } @@ -826,11 +826,11 @@ spcd_https_path() { spcd_install_package() { case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk add "${1}" ;; - "${SPCD_PM_APT}") apt-get install --assume-yes "${1}" ;; - "${SPCD_PM_DNF}") dnf install --assumeyes "${1}" ;; - "${SPCD_PM_PACMAN}") pacman --sync --noconfirm "${1}" ;; - "${SPCD_PM_ZYPPER}") zypper --non-interactive install "${1}" ;; + "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; + "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; + "${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; *) ;; esac spcd_clean_cache From f136bd1f07024e9711146203e8e28fb4c19e164b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 23:52:24 +0200 Subject: [PATCH 09/44] eval/update-ca,upgrade --- spcd/bootstrap.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index f3e956a..664fa64 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1312,13 +1312,13 @@ spcd_step__ca_update_certificates() { "${SPCD_OS_ALMA}" | \ "${SPCD_OS_FEDORA}" | \ "${SPCD_OS_ROCKY}") - update-ca-trust + spcd_eval update-ca-trust ;; "${SPCD_OS_ALPINE}" | \ "${SPCD_OS_DEBIAN}" | \ "${SPCD_OS_OPENSUSE}" | \ "${SPCD_OS_UBUNTU}") - update-ca-certificates + spcd_eval update-ca-certificates ;; *) ;; esac @@ -1340,11 +1340,11 @@ spcd_step__packages_verify_https() { spcd_step__packages_upgrade_system() { spcd_step "Upgrade system" case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk upgrade ;; - "${SPCD_PM_APT}") apt-get upgrade --assume-yes ;; - "${SPCD_PM_DNF}") dnf upgrade --assumeyes ;; - "${SPCD_PM_PACMAN}") pacman --sync --sysupgrade --noconfirm ;; - "${SPCD_PM_ZYPPER}") zypper --non-interactive update ;; + "${SPCD_PM_APK}") spcd_eval apk upgrade ;; + "${SPCD_PM_APT}") spcd_eval apt-get upgrade --assume-yes ;; + "${SPCD_PM_DNF}") spcd_eval dnf upgrade --assumeyes ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --sysupgrade --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive update ;; *) ;; esac } From 81db5ca39790570e6bdf13b95c7ca333d79fa4cc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 23:54:37 +0200 Subject: [PATCH 10/44] eval/pacman-key,update --- spcd/bootstrap.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 664fa64..1c49bb1 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1205,10 +1205,11 @@ Dir::Etc::SourceParts \"\"; esac case "${SPCD_OS_ID}" in "${SPCD_OS_ARCH}") - pacman-key --init + spcd_eval pacman-key --init ;; "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" + spcd_os_printenv DEBIAN_FRONTEND ;; *) ;; esac @@ -1246,11 +1247,11 @@ SSLVerify = No spcd_step__packages_update_catalog() { spcd_step "Update catalog" case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk update ;; - "${SPCD_PM_APT}") apt-get update ;; - "${SPCD_PM_DNF}") dnf makecache ;; - "${SPCD_PM_PACMAN}") pacman --sync --refresh ;; - "${SPCD_PM_ZYPPER}") zypper refresh ;; + "${SPCD_PM_APK}") spcd_eval apk update ;; + "${SPCD_PM_APT}") spcd_eval apt-get update ;; + "${SPCD_PM_DNF}") spcd_eval dnf makecache ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper refresh ;; *) ;; esac } From 164420d418a3dcfafc94db63c6e0394856d2406a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:04:42 +0200 Subject: [PATCH 11/44] eval/locales --- spcd/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 1c49bb1..3eaa305 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1013,7 +1013,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} done ;; "list") - if ! locale --all-locales; then + if ! spcd_eval locale --all-locales; then echo "No locales yet!" fi ;; From d021f61997e55dc58d2f721f7c196f0e80cb6e94 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:38:09 +0200 Subject: [PATCH 12/44] =?UTF-8?q?=E2=88=92eval?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3eaa305..9c123b4 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -250,7 +250,7 @@ nameserver ${value} spcd_eval() { if [ -n "${1}" ]; then echo "${@}" - eval "${@}" + "${@}" fi } From 1c1a60bc64b721eb6d41ea322ed4d9eb0304e9e5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:40:10 +0200 Subject: [PATCH 13/44] frame/* --- spcd/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 9c123b4..6e3f3ec 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -143,11 +143,11 @@ _SPCD_FRAME_TOP="${_SPCD_BOX_DOWN_AND_RIGHT}${_SPCD_BOX_LEFT}" _SPCD_FRAME_BOTTOM="${_SPCD_BOX_UP_AND_RIGHT}${_SPCD_BOX_LEFT}" _spcd_frame_open() { - echo "${_SPCD_FRAME_TOP}${1}" + echo "${_SPCD_FRAME_TOP}${*}" } _spcd_frame_shut() { - echo "${_SPCD_FRAME_BOTTOM}${1}" + echo "${_SPCD_FRAME_BOTTOM}${*}" } # ╭───┬────╮ From 5928a2fdcc99199200487659105ef8bb0236bc47 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:42:17 +0200 Subject: [PATCH 14/44] eval/open,shut --- spcd/bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 6e3f3ec..fb5355c 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -249,8 +249,9 @@ nameserver ${value} spcd_eval() { if [ -n "${1}" ]; then - echo "${@}" + _spcd_frame_open "${@}" "${@}" + _spcd_frame_shut "${@}" fi } From 8053d5f231e2abea0e55640bb5035313eefd0542 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:44:16 +0200 Subject: [PATCH 15/44] =?UTF-8?q?=E2=88=92task?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 47befa6..e668127 100644 --- a/readme.md +++ b/readme.md @@ -221,7 +221,6 @@ Handle project workflows in a unified way: #### Shell -* command to echo & run * comment * handle errors * packages From 2da608c462f86348685f05ae3bcb02a01cbe9cf7 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 00:50:54 +0200 Subject: [PATCH 16/44] tasks/behaviors --- readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e668127..f8d9ebc 100644 --- a/readme.md +++ b/readme.md @@ -217,7 +217,9 @@ Handle project workflows in a unified way: * build instead of readme * generate graphs -* list CI behavior differences +* list behavior differences + * Continuous Integration platforms + * Operating Systems #### Shell From 363fa82bd8edfb824e293c02d526e572fd4153c4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 07:45:39 +0200 Subject: [PATCH 17/44] pass --- spcd/bootstrap.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index fb5355c..5615ac7 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -195,9 +195,9 @@ _spcd_txt_pick() { esac } -# ╭───────────╮ -# │ functions │ -# ╰───────────╯ +# ╭────────────╮ +# │ p = public │ +# ╰────────────╯ spcd_ca() { local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)" @@ -255,9 +255,9 @@ spcd_eval() { fi } -# ╭───────────┬───────╮ -# │ functions │ error │ -# ╰───────────┴───────╯ +# ╭───┬───────╮ +# │ p │ error │ +# ╰───┴───────╯ spcd_error_ci() { echo "× CI: ${*}" @@ -270,9 +270,9 @@ spcd_error_os() { exit "${_SPCD_ERROR_OS}" } -# ╭───────────┬────╮ -# │ functions │ os │ -# ╰───────────┴────╯ +# ╭───┬────╮ +# │ p │ os │ +# ╰───┴────╯ spcd_os_grep() { local variable="${1}" @@ -337,17 +337,17 @@ spcd_os_write() { fi } -# ╭───────────┬───────╮ -# │ functions │ split │ -# ╰───────────┴───────╯ +# ╭───┬───────╮ +# │ p │ split │ +# ╰───┴───────╯ spcd_split() { echo "${_SPCD_RULE_LEFT}${_SPCD_RULE_MIDDLE}${_SPCD_RULE_RIGHT}" } -# ╭───────────┬──────╮ -# │ functions │ step │ -# ╰───────────┴──────╯ +# ╭───┬──────╮ +# │ p │ step │ +# ╰───┴──────╯ spcd_step() { if [ -n "${1}" ]; then @@ -371,9 +371,9 @@ spcd_step_out() { __SPCD_STEP_LEVEL=$((__SPCD_STEP_LEVEL - 1)) } -# ╭───────────┬─────╮ -# │ functions │ txt │ -# ╰───────────┴─────╯ +# ╭───┬─────╮ +# │ p │ txt │ +# ╰───┴─────╯ SPCD_TXT_LOCALE_ENGLISH="en_US" SPCD_TXT_LOCALE_FRENCH="fr_FR" From b3f74c2664bcfe9c9e8cb4f4dc99d7764ecfa04d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 07:48:35 +0200 Subject: [PATCH 18/44] s --- spcd/bootstrap.sh | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 5615ac7..49130a9 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -385,13 +385,13 @@ spcd_txt_get() { esac } -# ╭──────╮ -# │ step │ -# ╰──────╯ +# ╭──────────╮ +# │ s = step │ +# ╰──────────╯ -# ╭──────┬───────────╮ -# │ step │ constants │ -# ╰──────┴───────────╯ +# ╭───┬───────────╮ +# │ s │ constants │ +# ╰───┴───────────╯ SPCD_OS_ALMA="alma" SPCD_OS_ALPINE="alpine" @@ -408,9 +408,9 @@ SPCD_PM_DNF="dnf" SPCD_PM_PACMAN="pacman" SPCD_PM_ZYPPER="zypper" -# ╭──────┬─────────────╮ -# │ step │ environment │ -# ╰──────┴─────────────╯ +# ╭───┬─────────────╮ +# │ s │ environment │ +# ╰───┴─────────────╯ spcd_step__environment_print() { spcd_ca "list" @@ -778,9 +778,9 @@ spcd_step__environment_list_workspace() { spcd_os_ls "$(realpath .)" } -# ╭──────┬───────────╮ -# │ step │ functions │ -# ╰──────┴───────────╯ +# ╭───┬───────────╮ +# │ s │ functions │ +# ╰───┴───────────╯ spcd_clean_cache() { case "${SPCD_PM}" in @@ -1022,18 +1022,18 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } -# ╭──────┬─────╮ -# │ step │ dns │ -# ╰──────┴─────╯ +# ╭───┬─────╮ +# │ s │ dns │ +# ╰───┴─────╯ spcd_step__dns() { spcd_step "DNS" spcd_dns "write" } -# ╭──────┬──────────╮ -# │ step │ packages │ -# ╰──────┴──────────╯ +# ╭───┬──────────╮ +# │ s │ packages │ +# ╰───┴──────────╯ spcd_step__packages_set_repositories() { spcd_step "Set repositories" @@ -1276,9 +1276,9 @@ spcd_step__packages_install_locales() { spcd_step_out } -# ╭──────┬────╮ -# │ step │ ca │ -# ╰──────┴────╯ +# ╭───┬────╮ +# │ s │ ca │ +# ╰───┴────╯ spcd_step__ca_install_package() { spcd_step "Install package" @@ -1326,9 +1326,9 @@ spcd_step__ca_update_certificates() { esac } -# ╭──────┬──────────╮ -# │ step │ packages │ -# ╰──────┴──────────╯ +# ╭───┬──────────╮ +# │ s │ packages │ +# ╰───┴──────────╯ spcd_step__packages_verify_https() { spcd_step "Verify HTTPS" @@ -1361,9 +1361,9 @@ spcd_step__packages_install_git() { spcd_install_package "git" } -# ╭──────┬────────╮ -# │ step │ python │ -# ╰──────┴────────╯ +# ╭───┬────────╮ +# │ s │ python │ +# ╰───┴────────╯ spcd_step__python_install() { spcd_step "Install package" From e040e3e474aae5133f2cb223787a8ac2aa19c068 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 07:50:13 +0200 Subject: [PATCH 19/44] _ --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 49130a9..ee479e0 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1,8 +1,8 @@ #! /usr/bin/env sh -# ╭───╮ -# │ _ │ -# ╰───╯ +# ╭─────────────╮ +# │ _ = private │ +# ╰─────────────╯ _SPCD_BOX_DOWN_AND_HORIZONTAL="┬" _SPCD_BOX_DOWN_AND_LEFT="╮" From 7a0ca145fb51884ed284b88ec65c09d978064398 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 07:57:56 +0200 Subject: [PATCH 20/44] __ --- spcd/bootstrap.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index ee479e0..c3c2097 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1,5 +1,17 @@ #! /usr/bin/env sh +# ╭───────────────╮ +# │ __ = internal │ +# ╰───────────────╯ + +# __SPCD_BANNER_TOP +# __SPCD_BANNER_MIDDLE +# __SPCD_BANNER_BOTTOM + +# __SPCD_STEP_LEVEL +# __SPCD_STEP_level_INDEX +# __SPCD_STEP_level_LABEL + # ╭─────────────╮ # │ _ = private │ # ╰─────────────╯ From 712757e0842780f969af97386323a4c53cdd543a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:06:35 +0200 Subject: [PATCH 21/44] show/print --- spcd/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c3c2097..8909595 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -960,7 +960,7 @@ spcd_txt_locale() { *) ;; esac spcd_split - echo "${name}" + spcd_os_printenv "${name}" if [ -n "${regex}" ]; then locale --keyword-name "${name}" | grep "${regex}" fi From a2d668f74001ff23d384c70715163760ef703d0d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:40:22 +0200 Subject: [PATCH 22/44] e --- spcd/bootstrap.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 8909595..802b813 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -790,9 +790,9 @@ spcd_step__environment_list_workspace() { spcd_os_ls "$(realpath .)" } -# ╭───┬───────────╮ -# │ s │ functions │ -# ╰───┴───────────╯ +# ╭─────────────────╮ +# │ e = environment │ +# ╰─────────────────╯ spcd_clean_cache() { case "${SPCD_PM}" in @@ -1034,6 +1034,10 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } +# ╭───┬──────────╮ +# │ e │ packages │ +# ╰───┴──────────╯ + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From 1a5dcbf4d1426f81b92cdd5ffe75811fae3d9d11 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:41:11 +0200 Subject: [PATCH 23/44] pkg/query --- spcd/bootstrap.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 802b813..b5bb636 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -870,17 +870,6 @@ spcd_python_pip() { fi } -spcd_query_package() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk info "${1}" ;; - "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; - "${SPCD_PM_DNF}") rpm --query "${1}" ;; - "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; - "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; - *) ;; - esac -} - spcd_txt_locale() { local action="${1}" local chosen="${2}" @@ -1038,6 +1027,17 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ e │ packages │ # ╰───┴──────────╯ +spcd_query_package() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") apk info "${1}" ;; + "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; + "${SPCD_PM_DNF}") rpm --query "${1}" ;; + "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; + "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; + *) ;; + esac +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From 088762f1eec2a36046564441b8cfddebce1f6432 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:41:59 +0200 Subject: [PATCH 24/44] pkg/install --- spcd/bootstrap.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index b5bb636..71eb6be 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -837,18 +837,6 @@ spcd_https_path() { esac } -spcd_install_package() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; - "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; - "${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; - *) ;; - esac - spcd_clean_cache -} - spcd_python_ln() { local command="${1}" if [ -n "${command}" ]; then @@ -1027,6 +1015,18 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ e │ packages │ # ╰───┴──────────╯ +spcd_install_package() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; + "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; + "${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; + *) ;; + esac + spcd_clean_cache +} + spcd_query_package() { case "${SPCD_PM}" in "${SPCD_PM_APK}") apk info "${1}" ;; From 217f1a1b738bb5a64e934b8536658c36b4c26bf0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:43:45 +0200 Subject: [PATCH 25/44] pkg/https --- spcd/bootstrap.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 71eb6be..c8a93e6 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -826,17 +826,6 @@ spcd_git_url() { fi } -spcd_https_path() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; - "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; - "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; - "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac -} - spcd_python_ln() { local command="${1}" if [ -n "${command}" ]; then @@ -1015,6 +1004,17 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ e │ packages │ # ╰───┴──────────╯ +spcd_https_path() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; + "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; + "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; + "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac +} + spcd_install_package() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; From de32d1ba2fadd075369b5c2022b0c961f6762e50 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 10:45:07 +0200 Subject: [PATCH 26/44] pkg/clean --- spcd/bootstrap.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c8a93e6..6456daa 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -794,17 +794,6 @@ spcd_step__environment_list_workspace() { # │ e = environment │ # ╰─────────────────╯ -spcd_clean_cache() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk cache purge ;; - "${SPCD_PM_APT}") spcd_eval apt-get clean ;; - "${SPCD_PM_DNF}") spcd_eval dnf clean all ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;; - *) ;; - esac -} - spcd_git_clone() { if [ -n "${1}" ]; then local name path url @@ -1004,6 +993,17 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ e │ packages │ # ╰───┴──────────╯ +spcd_clean_cache() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_eval apk cache purge ;; + "${SPCD_PM_APT}") spcd_eval apt-get clean ;; + "${SPCD_PM_DNF}") spcd_eval dnf clean all ;; + "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;; + *) ;; + esac +} + spcd_https_path() { case "${SPCD_PM}" in "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; From 8af733e5dfe4742dfc10aeb2985d93464c430159 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 11:01:40 +0200 Subject: [PATCH 27/44] f --- spcd/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 6456daa..2a3a6dc 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -790,9 +790,9 @@ spcd_step__environment_list_workspace() { spcd_os_ls "$(realpath .)" } -# ╭─────────────────╮ -# │ e = environment │ -# ╰─────────────────╯ +# ╭──────────────╮ +# │ f = function │ +# ╰──────────────╯ spcd_git_clone() { if [ -n "${1}" ]; then @@ -990,7 +990,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} } # ╭───┬──────────╮ -# │ e │ packages │ +# │ f │ packages │ # ╰───┴──────────╯ spcd_clean_cache() { From cb250650ff15d316113f6b7b1be32ffdba54e9e1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:13:10 +0200 Subject: [PATCH 28/44] pm/clean --- spcd/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 2a3a6dc..86910ee 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -993,7 +993,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ f │ packages │ # ╰───┴──────────╯ -spcd_clean_cache() { +spcd_f_pm_clean() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_eval apk cache purge ;; "${SPCD_PM_APT}") spcd_eval apt-get clean ;; @@ -1024,7 +1024,7 @@ spcd_install_package() { "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; *) ;; esac - spcd_clean_cache + spcd_f_pm_clean } spcd_query_package() { From dabb5814e52bdddc2170ca07d505bd6f895fa061 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:19:16 +0200 Subject: [PATCH 29/44] pm/https --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 86910ee..3c57b99 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1004,7 +1004,7 @@ spcd_f_pm_clean() { esac } -spcd_https_path() { +spcd_f_pm_https() { case "${SPCD_PM}" in "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; @@ -1236,7 +1236,7 @@ spcd_step__packages_trust_https() { spcd_step "Trust HTTPS" local path text if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - path="$(spcd_https_path)" + path="$(spcd_f_pm_https)" if [ -n "${path}" ]; then spcd_os_mkdir "$(dirname "${path}")" case "${SPCD_PM}" in @@ -1349,7 +1349,7 @@ spcd_step__ca_update_certificates() { spcd_step__packages_verify_https() { spcd_step "Verify HTTPS" local path - path="$(spcd_https_path)" + path="$(spcd_f_pm_https)" if [ -n "${path}" ]; then spcd_os_rm "${path}" fi From b3acd1f8fef98ad1b50528428635a72f91a9b8b4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:21:30 +0200 Subject: [PATCH 30/44] pm/install --- spcd/bootstrap.sh | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3c57b99..0e3eb16 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -938,7 +938,7 @@ spcd_txt_locales() { spcd_split case "${SPCD_PM}" in "${SPCD_PM_APK}") - spcd_install_package "musl-locales" + spcd_f_pm_install "musl-locales" export MUSL_LOCPATH="/usr/share/i18n/locales/musl" ;; "${SPCD_PM_APT}") @@ -949,17 +949,17 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} " done spcd_os_write "/etc/locale.gen" "${text}" - spcd_install_package "locales" + spcd_f_pm_install "locales" ;; "${SPCD_PM_DNF}") local language for name in "${@}"; do language="$(echo "${name}" | cut -d _ -f 1)" - spcd_install_package "glibc-langpack-${language}" + spcd_f_pm_install "glibc-langpack-${language}" done ;; - "${SPCD_PM_PACMAN}") spcd_install_package "glibc-locales" ;; - "${SPCD_PM_ZYPPER}") spcd_install_package "glibc-locale" ;; + "${SPCD_PM_PACMAN}") spcd_f_pm_install "glibc-locales" ;; + "${SPCD_PM_ZYPPER}") spcd_f_pm_install "glibc-locale" ;; *) ;; esac spcd_split @@ -1015,7 +1015,7 @@ spcd_f_pm_https() { esac } -spcd_install_package() { +spcd_f_pm_install() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; @@ -1276,7 +1276,7 @@ spcd_step__packages_update_catalog() { spcd_step__packages_install_tools() { spcd_step "Install tools" case "${SPCD_PM}" in - "${SPCD_PM_APT}") spcd_install_package "apt-utils" ;; + "${SPCD_PM_APT}") spcd_f_pm_install "apt-utils" ;; *) ;; esac } @@ -1298,7 +1298,7 @@ spcd_step__packages_install_locales() { spcd_step__ca_install_package() { spcd_step "Install package" - spcd_install_package "ca-certificates" + spcd_f_pm_install "ca-certificates" } spcd_step__ca_write_certificates() { @@ -1369,12 +1369,12 @@ spcd_step__packages_upgrade_system() { spcd_step__packages_install_dos2unix() { spcd_step "Install dos2unix" - spcd_install_package "dos2unix" + spcd_f_pm_install "dos2unix" } spcd_step__packages_install_git() { spcd_step "Install Git" - spcd_install_package "git" + spcd_f_pm_install "git" } # ╭───┬────────╮ @@ -1383,7 +1383,7 @@ spcd_step__packages_install_git() { spcd_step__python_install() { spcd_step "Install package" - spcd_install_package "${SPCD_PYTHON_PACKAGE}" + spcd_f_pm_install "${SPCD_PYTHON_PACKAGE}" spcd_step "Link alias to command" spcd_python_ln "${SPCD_PYTHON_COMMAND}" # venv @@ -1391,7 +1391,7 @@ spcd_step__python_install() { spcd_step "Install package" case "${SPCD_OS_ID}" in "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") - spcd_install_package "python3-venv" + spcd_f_pm_install "python3-venv" ;; *) ;; esac @@ -1441,7 +1441,7 @@ spcd_step__install_packages() { spcd_step "EPEL" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") - spcd_install_package "epel-release" + spcd_f_pm_install "epel-release" case "${SPCD_OS_VERSION}" in "9") set -- \ @@ -1473,32 +1473,32 @@ spcd_step__install_packages() { esac # graphviz spcd_step "GraphViz" - spcd_install_package "graphviz" + spcd_f_pm_install "graphviz" # openssh spcd_step "OpenSSH" case "${SPCD_PM}" in "${SPCD_PM_APK}" | "${SPCD_PM_APT}") - spcd_install_package "openssh-client" + spcd_f_pm_install "openssh-client" ;; "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") - spcd_install_package "openssh-clients" + spcd_f_pm_install "openssh-clients" ;; - "${SPCD_PM_PACMAN}") spcd_install_package "openssh" ;; + "${SPCD_PM_PACMAN}") spcd_f_pm_install "openssh" ;; *) ;; esac # plantuml spcd_step "PlantUML" - spcd_install_package "plantuml" + spcd_f_pm_install "plantuml" # rsync spcd_step "Rsync" - spcd_install_package "rsync" + spcd_f_pm_install "rsync" # shell check spcd_step "ShellCheck" case "${SPCD_PM}" in "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") - spcd_install_package "ShellCheck" + spcd_f_pm_install "ShellCheck" ;; - *) spcd_install_package "shellcheck" ;; + *) spcd_f_pm_install "shellcheck" ;; esac # shfmt spcd_step "ShellFormat" @@ -1507,10 +1507,10 @@ spcd_step__install_packages() { "${SPCD_OS_DEBIAN}") case "${SPCD_OS_VERSION}" in "bullseye") ;; - *) spcd_install_package "shfmt" ;; + *) spcd_f_pm_install "shfmt" ;; esac ;; - *) spcd_install_package "shfmt" ;; + *) spcd_f_pm_install "shfmt" ;; esac spcd_step_out } From 516c18ca513ec84dbc910b71e17e404c00237094 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:22:03 +0200 Subject: [PATCH 31/44] pm/query --- spcd/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 0e3eb16..b2f106a 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1027,7 +1027,7 @@ spcd_f_pm_install() { spcd_f_pm_clean } -spcd_query_package() { +spcd_f_pm_query() { case "${SPCD_PM}" in "${SPCD_PM_APK}") apk info "${1}" ;; "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; From 1fa2c9f34b8e7f46d895928765ef7be6bbcca549 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:26:18 +0200 Subject: [PATCH 32/44] spcd_run --- spcd/bootstrap.sh | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index b2f106a..5c29cd8 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -259,7 +259,7 @@ nameserver ${value} fi } -spcd_eval() { +spcd_run() { if [ -n "${1}" ]; then _spcd_frame_open "${@}" "${@}" @@ -981,7 +981,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} done ;; "list") - if ! spcd_eval locale --all-locales; then + if ! spcd_run locale --all-locales; then echo "No locales yet!" fi ;; @@ -995,11 +995,11 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} spcd_f_pm_clean() { case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk cache purge ;; - "${SPCD_PM_APT}") spcd_eval apt-get clean ;; - "${SPCD_PM_DNF}") spcd_eval dnf clean all ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;; + "${SPCD_PM_APK}") spcd_run apk cache purge ;; + "${SPCD_PM_APT}") spcd_run apt-get clean ;; + "${SPCD_PM_DNF}") spcd_run dnf clean all ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;; *) ;; esac } @@ -1017,11 +1017,11 @@ spcd_f_pm_https() { spcd_f_pm_install() { case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; - "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; - "${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; + "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; + "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;; + "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; *) ;; esac spcd_f_pm_clean @@ -1222,7 +1222,7 @@ Dir::Etc::SourceParts \"\"; esac case "${SPCD_OS_ID}" in "${SPCD_OS_ARCH}") - spcd_eval pacman-key --init + spcd_run pacman-key --init ;; "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" @@ -1264,11 +1264,11 @@ SSLVerify = No spcd_step__packages_update_catalog() { spcd_step "Update catalog" case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk update ;; - "${SPCD_PM_APT}") spcd_eval apt-get update ;; - "${SPCD_PM_DNF}") spcd_eval dnf makecache ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --refresh ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper refresh ;; + "${SPCD_PM_APK}") spcd_run apk update ;; + "${SPCD_PM_APT}") spcd_run apt-get update ;; + "${SPCD_PM_DNF}") spcd_run dnf makecache ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; *) ;; esac } @@ -1330,13 +1330,13 @@ spcd_step__ca_update_certificates() { "${SPCD_OS_ALMA}" | \ "${SPCD_OS_FEDORA}" | \ "${SPCD_OS_ROCKY}") - spcd_eval update-ca-trust + spcd_run update-ca-trust ;; "${SPCD_OS_ALPINE}" | \ "${SPCD_OS_DEBIAN}" | \ "${SPCD_OS_OPENSUSE}" | \ "${SPCD_OS_UBUNTU}") - spcd_eval update-ca-certificates + spcd_run update-ca-certificates ;; *) ;; esac @@ -1358,11 +1358,11 @@ spcd_step__packages_verify_https() { spcd_step__packages_upgrade_system() { spcd_step "Upgrade system" case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_eval apk upgrade ;; - "${SPCD_PM_APT}") spcd_eval apt-get upgrade --assume-yes ;; - "${SPCD_PM_DNF}") spcd_eval dnf upgrade --assumeyes ;; - "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --sysupgrade --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive update ;; + "${SPCD_PM_APK}") spcd_run apk upgrade ;; + "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; + "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; *) ;; esac } From a8e8e2991261b4931df19b59cb951d64a7ad2e25 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:30:36 +0200 Subject: [PATCH 33/44] pm/upgrade --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 5c29cd8..dc9ead9 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1355,8 +1355,8 @@ spcd_step__packages_verify_https() { fi } -spcd_step__packages_upgrade_system() { - spcd_step "Upgrade system" +spcd_f_pm_upgrade() { + spcd_step "Upgrade" case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_run apk upgrade ;; "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; @@ -1586,7 +1586,7 @@ spcd_main() { spcd_step_in "Packages" spcd_step__packages_verify_https spcd_step__packages_update_catalog - spcd_step__packages_upgrade_system + spcd_f_pm_upgrade spcd_step__packages_install_dos2unix spcd_step__packages_install_git spcd_step_out From 261540d50353707685f4b25b8e4dae37bf738a27 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:31:12 +0200 Subject: [PATCH 34/44] mv --- spcd/bootstrap.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index dc9ead9..16f539b 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1038,6 +1038,18 @@ spcd_f_pm_query() { esac } +spcd_f_pm_upgrade() { + spcd_step "Upgrade" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk upgrade ;; + "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; + "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; + *) ;; + esac +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ @@ -1355,18 +1367,6 @@ spcd_step__packages_verify_https() { fi } -spcd_f_pm_upgrade() { - spcd_step "Upgrade" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk upgrade ;; - "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; - "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; - *) ;; - esac -} - spcd_step__packages_install_dos2unix() { spcd_step "Install dos2unix" spcd_f_pm_install "dos2unix" From e647554a481dc8d150d81ba531057bbe69acacfa Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:33:09 +0200 Subject: [PATCH 35/44] pm/update --- spcd/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 16f539b..d073a35 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1273,8 +1273,8 @@ SSLVerify = No fi } -spcd_step__packages_update_catalog() { - spcd_step "Update catalog" +spcd_f_pm_update() { + spcd_step "Update" case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_run apk update ;; "${SPCD_PM_APT}") spcd_run apt-get update ;; @@ -1572,7 +1572,7 @@ spcd_main() { spcd_step__packages_set_repositories spcd_step__packages_set_configuration spcd_step__packages_trust_https - spcd_step__packages_update_catalog + spcd_f_pm_update spcd_step__packages_install_tools spcd_step__packages_install_locales spcd_step_out @@ -1585,7 +1585,7 @@ spcd_main() { # packages spcd_step_in "Packages" spcd_step__packages_verify_https - spcd_step__packages_update_catalog + spcd_f_pm_update spcd_f_pm_upgrade spcd_step__packages_install_dos2unix spcd_step__packages_install_git From 040b1f03e4e6e62ec313487bc9fc278f3e67a396 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 12:34:08 +0200 Subject: [PATCH 36/44] mv --- spcd/bootstrap.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d073a35..f7b161d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1038,6 +1038,18 @@ spcd_f_pm_query() { esac } +spcd_f_pm_update() { + spcd_step "Update" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk update ;; + "${SPCD_PM_APT}") spcd_run apt-get update ;; + "${SPCD_PM_DNF}") spcd_run dnf makecache ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; + *) ;; + esac +} + spcd_f_pm_upgrade() { spcd_step "Upgrade" case "${SPCD_PM}" in @@ -1273,18 +1285,6 @@ SSLVerify = No fi } -spcd_f_pm_update() { - spcd_step "Update" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk update ;; - "${SPCD_PM_APT}") spcd_run apt-get update ;; - "${SPCD_PM_DNF}") spcd_run dnf makecache ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; - *) ;; - esac -} - spcd_step__packages_install_tools() { spcd_step "Install tools" case "${SPCD_PM}" in From 2b0107035b1d2e532b10dea29f532fda0a7e994c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:13:55 +0200 Subject: [PATCH 37/44] https/path --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index f7b161d..d50576d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1004,7 +1004,7 @@ spcd_f_pm_clean() { esac } -spcd_f_pm_https() { +spcd_f_pm_https_path() { case "${SPCD_PM}" in "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; @@ -1260,7 +1260,7 @@ spcd_step__packages_trust_https() { spcd_step "Trust HTTPS" local path text if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - path="$(spcd_f_pm_https)" + path="$(spcd_f_pm_https_path)" if [ -n "${path}" ]; then spcd_os_mkdir "$(dirname "${path}")" case "${SPCD_PM}" in @@ -1361,7 +1361,7 @@ spcd_step__ca_update_certificates() { spcd_step__packages_verify_https() { spcd_step "Verify HTTPS" local path - path="$(spcd_f_pm_https)" + path="$(spcd_f_pm_https_path)" if [ -n "${path}" ]; then spcd_os_rm "${path}" fi From a6e39413e431e174c9c6941e692ec12d72e303e5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:17:54 +0200 Subject: [PATCH 38/44] https/verify --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d50576d..0808366 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1358,8 +1358,8 @@ spcd_step__ca_update_certificates() { # │ s │ packages │ # ╰───┴──────────╯ -spcd_step__packages_verify_https() { - spcd_step "Verify HTTPS" +spcd_f_pm_https_verify() { + spcd_step "Verify" local path path="$(spcd_f_pm_https_path)" if [ -n "${path}" ]; then @@ -1584,7 +1584,7 @@ spcd_main() { spcd_step_out # packages spcd_step_in "Packages" - spcd_step__packages_verify_https + spcd_f_pm_https_verify spcd_f_pm_update spcd_f_pm_upgrade spcd_step__packages_install_dos2unix From ab1be3c78d9cf469cf9009de62dbe21905ce0461 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:19:05 +0200 Subject: [PATCH 39/44] mv --- spcd/bootstrap.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 0808366..a729777 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1015,6 +1015,15 @@ spcd_f_pm_https_path() { esac } +spcd_f_pm_https_verify() { + spcd_step "Verify" + local path + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_rm "${path}" + fi +} + spcd_f_pm_install() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; @@ -1358,15 +1367,6 @@ spcd_step__ca_update_certificates() { # │ s │ packages │ # ╰───┴──────────╯ -spcd_f_pm_https_verify() { - spcd_step "Verify" - local path - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_rm "${path}" - fi -} - spcd_step__packages_install_dos2unix() { spcd_step "Install dos2unix" spcd_f_pm_install "dos2unix" From 2aff78913d939bc6caeec09ab7f92c46b3e7a142 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:20:19 +0200 Subject: [PATCH 40/44] https/trust --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index a729777..b5625ad 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1265,8 +1265,8 @@ Dir::Etc::SourceParts \"\"; esac } -spcd_step__packages_trust_https() { - spcd_step "Trust HTTPS" +spcd_f_pm_https_trust() { + spcd_step "Trust" local path text if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then path="$(spcd_f_pm_https_path)" @@ -1571,7 +1571,7 @@ spcd_main() { spcd_step_in "Packages" spcd_step__packages_set_repositories spcd_step__packages_set_configuration - spcd_step__packages_trust_https + spcd_f_pm_https_trust spcd_f_pm_update spcd_step__packages_install_tools spcd_step__packages_install_locales From 56c1e88ded1c914355bce97d4b7113999547ee84 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:21:04 +0200 Subject: [PATCH 41/44] mv --- spcd/bootstrap.sh | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index b5625ad..5b05750 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1015,6 +1015,35 @@ spcd_f_pm_https_path() { esac } +spcd_f_pm_https_trust() { + spcd_step "Trust" + local path text + if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_mkdir "$(dirname "${path}")" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") text="\ +--no-verify +" ;; + "${SPCD_PM_APT}") text="\ +Acquire::https::Verify-Peer False; +" ;; + "${SPCD_PM_DNF}") text="\ +sslverify=False +" ;; + "${SPCD_PM_PACMAN}") text="\ +SSLVerify = No +" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac + [ -n "${text}" ] && + spcd_os_write "${path}" "${text}" + fi + fi +} + spcd_f_pm_https_verify() { spcd_step "Verify" local path @@ -1265,35 +1294,6 @@ Dir::Etc::SourceParts \"\"; esac } -spcd_f_pm_https_trust() { - spcd_step "Trust" - local path text - if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_mkdir "$(dirname "${path}")" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") text="\ ---no-verify -" ;; - "${SPCD_PM_APT}") text="\ -Acquire::https::Verify-Peer False; -" ;; - "${SPCD_PM_DNF}") text="\ -sslverify=False -" ;; - "${SPCD_PM_PACMAN}") text="\ -SSLVerify = No -" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac - [ -n "${text}" ] && - spcd_os_write "${path}" "${text}" - fi - fi -} - spcd_step__packages_install_tools() { spcd_step "Install tools" case "${SPCD_PM}" in From bc76b3f3b56870d962e285cf0912f464b4c964f3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:24:10 +0200 Subject: [PATCH 42/44] f/pm/https --- spcd/bootstrap.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 5b05750..6be0638 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -989,9 +989,9 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } -# ╭───┬──────────╮ -# │ f │ packages │ -# ╰───┴──────────╯ +# ╭───┬────╮ +# │ f │ pm │ +# ╰───┴────╯ spcd_f_pm_clean() { case "${SPCD_PM}" in @@ -1100,6 +1100,11 @@ spcd_f_pm_upgrade() { esac } +# ╭───┬────┬───────╮ +# │ f │ pm │ https │ +# ╰───┴────┴───────╯ + + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From 4b7fb8a89f0a9f65e70797bb0a8058726056b315 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 7 Sep 2024 13:24:58 +0200 Subject: [PATCH 43/44] mv --- spcd/bootstrap.sh | 97 +++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 6be0638..0268849 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1004,55 +1004,6 @@ spcd_f_pm_clean() { esac } -spcd_f_pm_https_path() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; - "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; - "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; - "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac -} - -spcd_f_pm_https_trust() { - spcd_step "Trust" - local path text - if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_mkdir "$(dirname "${path}")" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") text="\ ---no-verify -" ;; - "${SPCD_PM_APT}") text="\ -Acquire::https::Verify-Peer False; -" ;; - "${SPCD_PM_DNF}") text="\ -sslverify=False -" ;; - "${SPCD_PM_PACMAN}") text="\ -SSLVerify = No -" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac - [ -n "${text}" ] && - spcd_os_write "${path}" "${text}" - fi - fi -} - -spcd_f_pm_https_verify() { - spcd_step "Verify" - local path - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_rm "${path}" - fi -} - spcd_f_pm_install() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; @@ -1104,6 +1055,54 @@ spcd_f_pm_upgrade() { # │ f │ pm │ https │ # ╰───┴────┴───────╯ +spcd_f_pm_https_path() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; + "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; + "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; + "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac +} + +spcd_f_pm_https_trust() { + spcd_step "Trust" + local path text + if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_mkdir "$(dirname "${path}")" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") text="\ +--no-verify +" ;; + "${SPCD_PM_APT}") text="\ +Acquire::https::Verify-Peer False; +" ;; + "${SPCD_PM_DNF}") text="\ +sslverify=False +" ;; + "${SPCD_PM_PACMAN}") text="\ +SSLVerify = No +" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac + [ -n "${text}" ] && + spcd_os_write "${path}" "${text}" + fi + fi +} + +spcd_f_pm_https_verify() { + spcd_step "Verify" + local path + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_rm "${path}" + fi +} # ╭───┬─────╮ # │ s │ dns │ From 5fcb208d0b4dcd5c37ab694001871c971b22ac2f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 02:22:18 +0200 Subject: [PATCH 44/44] spcd.sh --- spcd.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 spcd.sh diff --git a/spcd.sh b/spcd.sh new file mode 100755 index 0000000..a577aed --- /dev/null +++ b/spcd.sh @@ -0,0 +1,27 @@ +#! /usr/bin/env sh + +gource \ +--auto-skip-seconds 1 \ +--date-format "%Y / %m / %d ⋅ %H : %M : %S" \ +--disable-progress \ +-f \ +--hide mouse,usernames \ +--highlight-dirs \ +--key \ +--output-framerate 60 \ +--seconds-per-day 2.0 \ +--output-ppm-stream - \ +| \ +ffmpeg \ +-codec:v ppm \ +-format image2pipe \ +-framerate 120 \ +-i - \ +-codec:v libx264 \ +-preset veryslow \ +-qp 23 \ +-movflags \ ++faststart \ +-pix_fmt yuv420p \ +-y \ +spcd.mp4