diff --git a/spcd.sh b/spcd.sh index c2c1812..df53ba7 100644 --- a/spcd.sh +++ b/spcd.sh @@ -398,7 +398,11 @@ Acquire::https::Verify-Peer False; SPCD_PYTHON_PACKAGE="python3.12" ;; "${SPCD_OS_ALPINE}") - SPCD_PYTHON_COMMAND="python3.11" + case "${SPCD_OS_VERSION}" in + "3.20") SPCD_PYTHON_COMMAND="python3.12" ;; + "3.19") SPCD_PYTHON_COMMAND="python3.11" ;; + *) ;; + esac SPCD_PYTHON_PACKAGE="python3" ;; "${SPCD_OS_ARCH}") @@ -414,8 +418,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_UBUNTU}") case "${SPCD_OS_VERSION}" in @@ -637,7 +641,10 @@ spcd_install_packages() { spcd_install_package "rsync" # shellcheck spcd_step "Install ShellCheck" - spcd_install_package "shellcheck" + case "${SPCD_PM}" in + "${SPCD_PM_DNF}") spcd_install_package "ShellCheck" ;; + *) spcd_install_package "shellcheck" ;; + esac # shfmt spcd_step "Install ShellFormat" case "${SPCD_OS_ID}" in diff --git a/spcd/__init__.py b/spcd/__init__.py index 2398f77..8d5ab7d 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -36,15 +36,6 @@ def main(main: str) -> None: if name == "__main__.py": spcd.set_ssh(*arguments) spcd.install_commands(main) - # FIXME abstract command - step("Install packages") - run( - "apt-get", - "install", - "--assume-yes", - "python3-sphinx", - "python3-sphinx-rtd-theme", - ) else: function = getattr(cmd, name.replace("-", "_")) function(*arguments)