From dd1a9ed807c28f27a9254e1d2297ffde8f2327ae Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 6 Sep 2024 22:31:42 +0200 Subject: [PATCH 1/6] =?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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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 ;;