From 6475063e3e837ab877188718d6db1d143c213e19 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:13:25 +0200 Subject: [PATCH 01/21] step --- spcd/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c80c600..7da2871 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -299,10 +299,10 @@ spcd_split() { spcd_step() { if [ -n "${1}" ]; then [ -n "${__SPCD_STEP_LEVEL}" ] || __SPCD_STEP_LEVEL=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}\"" + local prefix="__SPCD_STEP_${__SPCD_STEP_LEVEL}" + local index="${prefix}_INDEX" + eval "${index}=\$((${index} + 1))" + eval "${prefix}_LABEL=\"${1}\"" _spcd_banner_render fi } From b00e8881a4bba3d66082abf51dd163a8eec67d07 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:18:14 +0200 Subject: [PATCH 02/21] locale --- spcd/bootstrap.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 7da2871..c7028d0 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -334,12 +334,14 @@ spcd_txt_get() { spcd_txt_locale() { # LANGUAGE + local name + local value if [ -n "${1}" ]; then - spcd_step__locale__value="${1}" + value="${1}" else - spcd_step__locale__value="${_SPCD_TXT_LOCALE_DEFAULT}" + value="${_SPCD_TXT_LOCALE_DEFAULT}" fi - spcd_step__locale__value="${spcd_step__locale__value}.${_SPCD_TXT_CHARSET}" + value="${value}.${_SPCD_TXT_CHARSET}" set -- \ "LANG" \ "LC_CTYPE" \ @@ -354,8 +356,8 @@ spcd_txt_locale() { "LC_TELEPHONE" \ "LC_MEASUREMENT" \ "LC_IDENTIFICATION" - for spcd_step__locale__name in "${@}"; do - export "${spcd_step__locale__name}=${spcd_step__locale__value}" + for name in "${@}"; do + export "${name}=${value}" done } From 5053dca4fb73b8e42a71d61bcc896b7f8b0f27d0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:19:46 +0200 Subject: [PATCH 03/21] print --- spcd/bootstrap.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c7028d0..cdd163f 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -410,11 +410,14 @@ spcd_step__environment_defaults_print() { "URL_PYTHON" \ "URL_ROCKY" \ "URL_UBUNTU" - for spcd_step_edp__item in "${@}"; do - spcd_step_edp__name="SPCD_${spcd_step_edp__item}" - eval "spcd_step_edp__value=\"\${${spcd_step_edp__name}}\"" - if [ -n "${spcd_step_edp__value}" ]; then - spcd_os_printenv "${spcd_step_edp__name}" + local item + local name + local value + for item in "${@}"; do + name="SPCD_${item}" + eval "value=\"\${${name}}\"" + if [ -n "${value}" ]; then + spcd_os_printenv "${name}" fi done } From 2b950472edc361c1bd900a2371a9b518257e4dcd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:21:24 +0200 Subject: [PATCH 04/21] workspace --- spcd/bootstrap.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index cdd163f..d33ab95 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -755,8 +755,7 @@ ${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" spcd_step__environment_list_workspace() { spcd_step "List workspace" - spcd_lwd__path="$(realpath .)" - spcd_os_ls "${spcd_lwd__path}" + spcd_os_ls "$(realpath .)" } # ╭──────┬───────────╮ From da24f0ccd8aa2a636565b9d1a67c6150b4264eb8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:26:10 +0200 Subject: [PATCH 05/21] clone --- spcd/bootstrap.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d33ab95..fe3829d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -775,11 +775,12 @@ spcd_clean_cache() { spcd_git_clone() { if [ -n "${1}" ]; then - 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}" - echo "${spcd_gc__path}" + local name path url + name="$(basename "${1}")" + path="${SPCD_DL}/${name}" + url="$(spcd_git_url "${1}")" + git clone "${url}" "${path}" + echo "${path}" fi } From 88f3f036b06a236087e7444287fe2f60530758d1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:27:22 +0200 Subject: [PATCH 06/21] filler --- spcd/bootstrap.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index fe3829d..596dc99 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -27,9 +27,10 @@ _SPCD_BANNER_VERTICAL="│" _spcd_banner_add() { if [ -n "${1}" ]; then - local text=" ${1} " - local length=${#text} - local filler="$(_spcd_fill "${length}" "${_SPCD_BANNER_HORIZONTAL}")" + local text length filler + text=" ${1} " + length=${#text} + filler="$(_spcd_fill "${length}" "${_SPCD_BANNER_HORIZONTAL}")" if [ -n "${__SPCD_BANNER_MIDDLE}" ]; then _spcd_banner_split else From 014d10bf98f10ffc651a40366a83cd471d8200ee Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:29:48 +0200 Subject: [PATCH 07/21] ln --- spcd/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 596dc99..d579be8 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -819,10 +819,10 @@ spcd_install_package() { } spcd_python_ln() { - spcd_python_ln__command="${1}" - if [ -n "${spcd_python_ln__command}" ]; then - echo "→ ${SPCD_PYTHON_ALIAS} → ${spcd_python_ln__command}" - ln -f -s "${spcd_python_ln__command}" \ + local command="${1}" + if [ -n "${command}" ]; then + echo "→ ${SPCD_PYTHON_ALIAS} → ${command}" + ln -f -s "${command}" \ "/usr/bin/${SPCD_PYTHON_ALIAS}" fi } From 1c5b7d138dd7dcffb735e8ec9e4530a0a209018f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:30:59 +0200 Subject: [PATCH 08/21] pip --- spcd/bootstrap.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d579be8..c25df3d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -829,12 +829,13 @@ spcd_python_ln() { spcd_python_pip() { if [ -n "${1}" ]; then - spcd_pp__name="$(basename "${1}")" - spcd_pp__path="$(spcd_git_clone "${1}")" - spcd_pp__path="${spcd_pp__path}/${spcd_pp__name}" - spcd_pp__target="${SPCD_PYTHON_VENV_PACKAGES}" - cp --recursive "${spcd_pp__path}" "${spcd_pp__target}" - echo "${spcd_pp__target}/${spcd_pp__name}" + local name path target + name="$(basename "${1}")" + path="$(spcd_git_clone "${1}")" + path="${path}/${name}" + target="${SPCD_PYTHON_VENV_PACKAGES}" + cp --recursive "${path}" "${target}" + echo "${target}/${name}" fi } From 263643ab204e3e1f0dccad00fb87c76e5e690973 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:31:41 +0200 Subject: [PATCH 09/21] tasks/query --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 736eedb..5c32038 100644 --- a/readme.md +++ b/readme.md @@ -255,6 +255,7 @@ Handle project workflows in a unified way: * venv * create * activate +* query package * relay environment module name #### Python From 05636f94f38f23f0159630091a87c29b72a55ccb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:32:52 +0200 Subject: [PATCH 10/21] dns --- spcd/bootstrap.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c25df3d..189dc15 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -856,15 +856,16 @@ spcd_query_package() { spcd_step__dns() { spcd_step "DNS" + local index value text while true; do - spcd_sdr__index=$((spcd_sdr__index + 1)) - eval "spcd_sdr__value=\"\${SPCD_DNS_${spcd_sdr__index}}\"" - [ -n "${spcd_sdr__value}" ] || break - spcd_sdr__text="${spcd_sdr__text}\ -nameserver ${spcd_sdr__value} + index=$((index + 1)) + eval "value=\"\${SPCD_DNS_${index}}\"" + [ -n "${value}" ] || break + text="${text}\ +nameserver ${value} " done - spcd_os_write "/etc/resolv.conf" "${spcd_sdr__text}" + spcd_os_write "/etc/resolv.conf" "${text}" } # ╭──────┬──────────╮ From a599e31cb169f50535b6025b38579e814e850620 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:38:12 +0200 Subject: [PATCH 11/21] repos --- spcd/bootstrap.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 189dc15..2ec0029 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -874,6 +874,7 @@ nameserver ${value} spcd_step__packages_set_repositories() { spcd_step "Set repositories" + local file case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}") case "${SPCD_OS_VERSION}" in @@ -905,8 +906,8 @@ spcd_step__packages_set_repositories() { ;; *) ;; esac - for spcd_spr__file in "${@}"; do - spcd_os_sed "/etc/yum.repos.d/almalinux${spcd_spr__file}.repo" \ + for file in "${@}"; do + spcd_os_sed "/etc/yum.repos.d/almalinux${file}.repo" \ "|^mirrorlist|#mirrorlist|" \ "|https://repo.almalinux.org|${SPCD_URL_ALMA}|" \ "|^# baseurl|baseurl|" @@ -936,8 +937,8 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main "-updates-testing" \ "-updates" \ "" - for spcd_spr__file in "${@}"; do - spcd_os_sed "/etc/yum.repos.d/fedora${spcd_spr__file}.repo" \ + for file in "${@}"; do + spcd_os_sed "/etc/yum.repos.d/fedora${file}.repo" \ "|^metalink|#metalink|" "\ |http://download.example/pub/fedora/linux|${SPCD_URL_FEDORA}|" \ "|^#baseurl|baseurl|" @@ -960,8 +961,8 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main "source" \ "update-non-oss" \ "update" - for spcd_spr__file in "${@}"; do - spcd_os_sed "/etc/zypp/repos.d/repo-${spcd_spr__file}.repo" \ + for file in "${@}"; do + spcd_os_sed "/etc/zypp/repos.d/repo-${file}.repo" \ "|http://download.opensuse.org|${SPCD_URL_OPENSUSE}|" done spcd_os_sed "/etc/zypp/repos.d/repo-openh264.repo" \ @@ -994,8 +995,8 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main ;; *) ;; esac - for spcd_spr__file in "${@}"; do - spcd_os_sed "/etc/yum.repos.d/${spcd_spr__file}.repo" \ + for file in "${@}"; do + spcd_os_sed "/etc/yum.repos.d/${file}.repo" \ "|^mirrorlist|#mirrorlist|" \ "|http://dl.rockylinux.org|${SPCD_URL_ROCKY}|" \ "|^#baseurl|baseurl|" From c21b751b72cb862a7cfe25a0a7417e5ca035f37e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:50:20 +0200 Subject: [PATCH 12/21] trust --- spcd/bootstrap.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 2ec0029..7f37345 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1054,28 +1054,29 @@ Dir::Etc::SourceParts \"\"; spcd_step__packages_trust_https() { spcd_step "Trust HTTPS" + local path text if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - spcd_pth__path="$(spcd_https_path)" - if [ -n "${spcd_pth__path}" ]; then - spcd_os_mkdir "$(dirname "${spcd_pth__path}")" + path="$(spcd_https_path)" + if [ -n "${path}" ]; then + spcd_os_mkdir "$(dirname "${path}")" case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_pth__text="\ + "${SPCD_PM_APK}") text="\ --no-verify " ;; - "${SPCD_PM_APT}") spcd_pth__text="\ + "${SPCD_PM_APT}") text="\ Acquire::https::Verify-Peer False; " ;; - "${SPCD_PM_DNF}") spcd_pth__text="\ + "${SPCD_PM_DNF}") text="\ sslverify=False " ;; - "${SPCD_PM_PACMAN}") spcd_pth__text="\ + "${SPCD_PM_PACMAN}") text="\ SSLVerify = No " ;; "${SPCD_PM_ZYPPER}") ;; *) ;; esac - [ -n "${spcd_pth__text}" ] && - spcd_os_write "${spcd_pth__path}" "${spcd_pth__text}" + [ -n "${text}" ] && + spcd_os_write "${path}" "${text}" fi fi } From 225a48ee218bc42dee5275b0b0c05fdd1417ef64 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:54:01 +0200 Subject: [PATCH 13/21] ca --- spcd/bootstrap.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 7f37345..39b2f1b 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1112,30 +1112,31 @@ spcd_step__ca_install_package() { spcd_step__ca_write_certificates() { spcd_step "Write certificates" + local root index text path case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}") - spcd_wcc__root="/etc/pki/ca-trust/source/anchors" + root="/etc/pki/ca-trust/source/anchors" ;; "${SPCD_OS_ALPINE}" | "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") - spcd_wcc__root="/usr/local/share/ca-certificates" + root="/usr/local/share/ca-certificates" ;; "${SPCD_OS_ARCH}") - spcd_wcc__root="/etc/ca-certificates/trust-source/anchors" + root="/etc/ca-certificates/trust-source/anchors" ;; "${SPCD_OS_OPENSUSE}") - spcd_wcc__root="/etc/pki/trust/anchors" + root="/etc/pki/trust/anchors" ;; *) ;; esac - spcd_os_mkdir "${spcd_wcc__root}" + spcd_os_mkdir "${root}" while true; do - spcd_wcc__index=$((spcd_wcc__index + 1)) - eval "spcd_wcc__text=\"\${SPCD_CA_${spcd_wcc__index}}\"" - [ -n "${spcd_wcc__text}" ] || break - spcd_wcc__path="${spcd_wcc__root}/${spcd_wcc__index}.crt" + index=$((index + 1)) + eval "text=\"\${SPCD_CA_${index}}\"" + [ -n "${text}" ] || break + path="${root}/${index}.crt" spcd_split - spcd_os_write "${spcd_wcc__path}" "${spcd_wcc__text}" - spcd_openssl_x509 "${spcd_wcc__path}" + spcd_os_write "${path}" "${text}" + spcd_openssl_x509 "${path}" done } From 417d22dff1b00b938c09be5a278449ad15375d04 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:55:10 +0200 Subject: [PATCH 14/21] verify --- spcd/bootstrap.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 39b2f1b..ba26ddc 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1165,9 +1165,10 @@ spcd_step__ca_update_certificates() { spcd_step__packages_verify_https() { spcd_step "Verify HTTPS" - spcd_pvh__path="$(spcd_https_path)" - if [ -n "${spcd_pvh__path}" ]; then - spcd_os_rm "${spcd_pvh__path}" + local path + path="$(spcd_https_path)" + if [ -n "${path}" ]; then + spcd_os_rm "${path}" fi } From 6be00f16558e7026d1d8fed071626df4f4b48d05 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 09:59:39 +0200 Subject: [PATCH 15/21] locales --- spcd/bootstrap.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index ba26ddc..ae8d7ec 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1180,21 +1180,20 @@ spcd_step__packages_install_locales() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_install_package "musl-locales" ;; "${SPCD_PM_APT}") - unset spcd_step__pil__text - for spcd_step__pil__locale in "${@}"; do - spcd_step__pil__text="${spcd_step__pil__text}\ -${spcd_step__pil__locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} + local locale text + for locale in "${@}"; do + text="${text}\ +${locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} " done - spcd_os_write "/etc/locale.gen" "${spcd_step__pil__text}" + spcd_os_write "/etc/locale.gen" "${text}" spcd_install_package "locales" ;; "${SPCD_PM_DNF}") - for spcd_step__pil__locale in "${@}"; do - spcd_step__pil__lang="$( - echo "${spcd_step__pil__locale}" | cut -d _ -f 1 - )" - spcd_install_package "glibc-langpack-${spcd_step__pil__lang}" + local locale language + for locale in "${@}"; do + language="$(echo "${locale}" | cut -d _ -f 1)" + spcd_install_package "glibc-langpack-${language}" done ;; "${SPCD_PM_PACMAN}") spcd_install_package "glibc-locales" ;; From 5c0956c09b5cdaa44ab78b2e880bc0329d30c9a9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 10:03:23 +0200 Subject: [PATCH 16/21] modules --- spcd/bootstrap.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index ae8d7ec..2347c58 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1258,26 +1258,27 @@ index-url = ${SPCD_URL_PYTHON}/simple spcd_step__python_modules() { spcd_step_in "Modules" - spcd_ipm__target="${SPCD_PYTHON_VENV_PACKAGES}" + local target path script check + target="${SPCD_PYTHON_VENV_PACKAGES}" spcd_step "List" - spcd_os_ls "${spcd_ipm__target}" + spcd_os_ls "${target}" spcd_step "Main" - spcd_ipm__path="$(spcd_python_pip "${SPCD_GIT_SPCD}")" + path="$(spcd_python_pip "${SPCD_GIT_SPCD}")" # check matching of file and variable spcd_step "Check" - spcd_ipm__script="${spcd_ipm__path}/bootstrap.sh" - ls -l "${spcd_ipm__script}" - spcd_ipm__check="${spcd_ipm__script}.${SPCD_CMD_SUM}" - "${SPCD_CMD_SUM}" "${spcd_ipm__script}" >"${spcd_ipm__check}" - printf "%s" "${SPCD}" >"${spcd_ipm__script}" - ls -l "${spcd_ipm__script}" - dos2unix "${spcd_ipm__script}" - ls -l "${spcd_ipm__script}" - "${SPCD_CMD_SUM}" -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" + script="${path}/bootstrap.sh" + ls -l "${script}" + check="${script}.${SPCD_CMD_SUM}" + "${SPCD_CMD_SUM}" "${script}" >"${check}" + printf "%s" "${SPCD}" >"${script}" + ls -l "${script}" + dos2unix "${script}" + ls -l "${script}" + "${SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD" spcd_step "Root" spcd_python_pip "${SPCD_GIT_RWX}" spcd_step "List" - spcd_os_ls "${spcd_ipm__target}" + spcd_os_ls "${target}" spcd_step_out } From 25e08725a82266d94823e5cc62af06f586217ea1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 10:54:54 +0200 Subject: [PATCH 17/21] packages --- spcd/bootstrap.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 2347c58..94981fc 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1284,6 +1284,7 @@ spcd_step__python_modules() { spcd_step__install_packages() { spcd_step_in "OS packages" + local file # epel spcd_step "EPEL" case "${SPCD_OS_ID}" in @@ -1304,15 +1305,15 @@ spcd_step__install_packages() { ;; *) ;; esac - for spcd_spr__file in "${@}"; do - spcd_os_sed "/etc/yum.repos.d/epel${spcd_spr__file}.repo" \ + for file in "${@}"; do + spcd_os_sed "/etc/yum.repos.d/epel${file}.repo" \ "|^metalink|#metalink|" \ "|https://download.example/pub/epel|${SPCD_URL_EPEL}|" \ "|^#baseurl|baseurl|" done - spcd_spr__file="/etc/yum.repos.d/epel-cisco-openh264.repo" + file="/etc/yum.repos.d/epel-cisco-openh264.repo" if [ -f "${spcd_spr__file}" ]; then - spcd_os_sed "${spcd_spr__file}" \ + spcd_os_sed "${file}" \ "|^enabled=1|#enabled=0|" fi ;; From 4974430c36d631a6a8243179c3529f10576b558d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 10:56:03 +0200 Subject: [PATCH 18/21] disable --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 94981fc..c8c7a1e 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -944,7 +944,7 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main "|^#baseurl|baseurl|" done spcd_os_sed "/etc/yum.repos.d/fedora-cisco-openh264.repo" \ - "|^enabled=1|#enabled=0|" + "|^enabled=1|enabled=0|" ;; "${SPCD_OS_OPENSUSE}") set -- \ @@ -966,7 +966,7 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main "|http://download.opensuse.org|${SPCD_URL_OPENSUSE}|" done spcd_os_sed "/etc/zypp/repos.d/repo-openh264.repo" \ - "|^enabled=1|#enabled=0|" + "|^enabled=1|enabled=0|" ;; "${SPCD_OS_ROCKY}") case "${SPCD_OS_VERSION}" in @@ -1314,7 +1314,7 @@ spcd_step__install_packages() { file="/etc/yum.repos.d/epel-cisco-openh264.repo" if [ -f "${spcd_spr__file}" ]; then spcd_os_sed "${file}" \ - "|^enabled=1|#enabled=0|" + "|^enabled=1|enabled=0|" fi ;; *) ;; From 1b71ed0c1344387475674280ed0e0e21b6161cfe Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 10:58:49 +0200 Subject: [PATCH 19/21] module --- spcd/bootstrap.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index c8c7a1e..9b0017d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1365,20 +1365,21 @@ spcd_step__install_packages() { spcd_step__python_write_module() { spcd_step "Write module" - for spcd_wpm__variable in \ + local variable value text index root + for variable in \ OS_ID OS_VERSION \ PROJECT_ROOT PROJECT_PATH PROJECT_NAME \ PYTHON_VENV_BINARIES PYTHON_VENV_PACKAGES \ OPEN DOWN VERT SPLT __UP SHUT; do - spcd_wpm__value="$(spcd_os_printenv "SPCD_${spcd_wpm__variable}")" - spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value} + value="$(spcd_os_printenv "SPCD_${variable}")" + text="${text}${value} " done - spcd_wpm__index=$((__SPCD_STEP_1_INDEX + 1)) - for spcd_wpm__root in \ + index=$((__SPCD_STEP_1_INDEX + 1)) + for root in \ "${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do - spcd_os_write "${spcd_wpm__root}/env.py" "${spcd_wpm__text} -SPCD_STEP = ${spcd_wpm__index} + spcd_os_write "${root}/env.py" "${text} +SPCD_STEP = ${index} " done } From 746f3968f210102405d58fa3dd5e9c5049ea3336 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 11:00:17 +0200 Subject: [PATCH 20/21] switch --- spcd/bootstrap.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 9b0017d..6a57dbc 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1386,13 +1386,14 @@ SPCD_STEP = ${index} spcd_step__python_switch() { spcd_step "Switch" - spcd_stp__name="$(basename "${SPCD_GIT_SPCD}")" - spcd_stp__path="$(realpath "${0}")" + local name path + name="$(basename "${SPCD_GIT_SPCD}")" + path="$(realpath "${0}")" echo "\ -${spcd_stp__path} +${path} ↓ -${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" - "${SPCD_PYTHON_ALIAS}" -m "${spcd_stp__name}" +${SPCD_PYTHON_ALIAS} / ${name}" + "${SPCD_PYTHON_ALIAS}" -m "${name}" } # ╭──────╮ From 351c9742ef29283df0b9a0f02343612e70037ab0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 31 Aug 2024 11:10:19 +0200 Subject: [PATCH 21/21] =?UTF-8?q?=E2=88=92test/local?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd/bootstrap.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 6a57dbc..70a3673 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1400,15 +1400,7 @@ ${SPCD_PYTHON_ALIAS} / ${name}" # │ main │ # ╰──────╯ -spcd_test_local() { - local local_variable="KO!" - non_local_variable="OK" -} - spcd_main() { - spcd_test_local - echo "local_variable = \"${local_variable}\"" - echo "non_local_variable = \"${non_local_variable}\"" # environment spcd_txt_locale #