diff --git a/readme.md b/readme.md index c3968fe..30772eb 100644 --- a/readme.md +++ b/readme.md @@ -70,17 +70,17 @@ from various contexts of CA, CI and OCI / OS. | os | https | updat-ca | python | graphviz | plantuml | shellcheck | shfmt | |:----------------|---|---|:------------|:------|:-----------|:------|:-----| | Arch 20240101 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 3.8 | -| Fedora 40 | ☑ | ☑ | 3.13 ← 3.12 | 9.0 | 1.2024.6 | 0.9 | 3.7 | | Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 3.8 | -| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | u3.8 | +| Fedora 40 | ☑ | ☑ | 3.13 ← 3.12 | 9.0 | 1.2024.6 | 0.9 | 3.7 | | Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 3.6 | | OpenSUSE 15.6 | ☐ | ☑ | 3.12 ← 3.6 | 2.48 | 1.2020.9 | 0.8 | 3.5 | +| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | u3.8 | | Alma | Rocky 9 | ☑ | ☑ | 3.12 ← 3.9 | 2.44 | e1.2024.6 | e0.8 | | | os | https | updat-ca | python | graphviz | plantuml | shellcheck | shfmt | |:----------------|---|---|:------------|:------|:-----------|:------|:-----| -| Fedora 39 | ☑ | ☑ | 3.13 ← 3.12 | 8.1 | 1.2024.6 | 0.9 | 3.5 | | Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 3.7 | +| Fedora 39 | ☑ | ☑ | 3.13 ← 3.12 | 8.1 | 1.2024.6 | 0.9 | 3.5 | | OpenSUSE 15.5 | ☐ | ☑ | 3.11 ← 3.6 | 2.48 | 1.2020.9 | 0.8 | 3.5 | | Alma | Rocky 8 | ☑ | ☑ | 3.12 ← 3.6 | 2.40 | e1.2024.6 | e0.6 | | diff --git a/spcd.sh b/spcd.sh index 95a6298..854bae7 100644 --- a/spcd.sh +++ b/spcd.sh @@ -449,8 +449,8 @@ Acquire::https::Verify-Peer False; SPCD_PYTHON_PACKAGE="python3" ;; "${SPCD_OS_FEDORA}") - SPCD_PYTHON_COMMAND="python3.13" - SPCD_PYTHON_PACKAGE="python3.13" + SPCD_PYTHON_COMMAND="python3.12" + SPCD_PYTHON_PACKAGE="python3" ;; "${SPCD_OS_OPENSUSE}") case "${SPCD_OS_VERSION}" in @@ -768,7 +768,9 @@ spcd_install_packages() { # shell check spcd_step "Install ShellCheck" case "${SPCD_PM}" in - "${SPCD_PM_DNF}") spcd_install_package "ShellCheck" ;; + "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") + spcd_install_package "ShellCheck" + ;; *) spcd_install_package "shellcheck" ;; esac # shfmt @@ -786,7 +788,9 @@ spcd_install_packages() { "${SPCD_PM_APK}" | "${SPCD_PM_APT}") spcd_install_package "openssh-client" ;; - "${SPCD_PM_DNF}") spcd_install_package "openssh-clients" ;; + "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") + spcd_install_package "openssh-clients" + ;; "${SPCD_PM_PACMAN}") spcd_install_package "openssh" ;; *) ;; esac