diff --git a/spcd.sh b/spcd.sh index df53ba7..c2c1812 100644 --- a/spcd.sh +++ b/spcd.sh @@ -398,11 +398,7 @@ Acquire::https::Verify-Peer False; SPCD_PYTHON_PACKAGE="python3.12" ;; "${SPCD_OS_ALPINE}") - case "${SPCD_OS_VERSION}" in - "3.20") SPCD_PYTHON_COMMAND="python3.12" ;; - "3.19") SPCD_PYTHON_COMMAND="python3.11" ;; - *) ;; - esac + SPCD_PYTHON_COMMAND="python3.11" SPCD_PYTHON_PACKAGE="python3" ;; "${SPCD_OS_ARCH}") @@ -418,8 +414,8 @@ Acquire::https::Verify-Peer False; SPCD_PYTHON_PACKAGE="python3" ;; "${SPCD_OS_FEDORA}") - SPCD_PYTHON_COMMAND="python3.12" - SPCD_PYTHON_PACKAGE="python3" + SPCD_PYTHON_COMMAND="python3.13" + SPCD_PYTHON_PACKAGE="python3.13" ;; "${SPCD_OS_UBUNTU}") case "${SPCD_OS_VERSION}" in @@ -641,10 +637,7 @@ spcd_install_packages() { spcd_install_package "rsync" # shellcheck spcd_step "Install ShellCheck" - case "${SPCD_PM}" in - "${SPCD_PM_DNF}") spcd_install_package "ShellCheck" ;; - *) spcd_install_package "shellcheck" ;; - esac + spcd_install_package "shellcheck" # shfmt spcd_step "Install ShellFormat" case "${SPCD_OS_ID}" in diff --git a/spcd/__init__.py b/spcd/__init__.py index 8d5ab7d..2398f77 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -36,6 +36,15 @@ 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)