Compare commits

..

4 commits

Author SHA1 Message Date
cd222bdeaf
alpine/python3
Some checks failed
/ job (push) Failing after 1m6s
2024-07-22 10:07:39 +02:00
21ffd1ab79
fedora/python3 2024-07-22 10:03:44 +02:00
f73fda5e60
−fixme 2024-07-22 10:00:39 +02:00
01fd83badf
ShellCheck 2024-07-22 09:56:08 +02:00
2 changed files with 11 additions and 13 deletions

15
spcd.sh
View file

@ -398,7 +398,11 @@ Acquire::https::Verify-Peer False;
SPCD_PYTHON_PACKAGE="python3.12" SPCD_PYTHON_PACKAGE="python3.12"
;; ;;
"${SPCD_OS_ALPINE}") "${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_PYTHON_PACKAGE="python3"
;; ;;
"${SPCD_OS_ARCH}") "${SPCD_OS_ARCH}")
@ -414,8 +418,8 @@ Acquire::https::Verify-Peer False;
SPCD_PYTHON_PACKAGE="python3" SPCD_PYTHON_PACKAGE="python3"
;; ;;
"${SPCD_OS_FEDORA}") "${SPCD_OS_FEDORA}")
SPCD_PYTHON_COMMAND="python3.13" SPCD_PYTHON_COMMAND="python3.12"
SPCD_PYTHON_PACKAGE="python3.13" SPCD_PYTHON_PACKAGE="python3"
;; ;;
"${SPCD_OS_UBUNTU}") "${SPCD_OS_UBUNTU}")
case "${SPCD_OS_VERSION}" in case "${SPCD_OS_VERSION}" in
@ -637,7 +641,10 @@ spcd_install_packages() {
spcd_install_package "rsync" spcd_install_package "rsync"
# shellcheck # shellcheck
spcd_step "Install 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 # shfmt
spcd_step "Install ShellFormat" spcd_step "Install ShellFormat"
case "${SPCD_OS_ID}" in case "${SPCD_OS_ID}" in

View file

@ -36,15 +36,6 @@ def main(main: str) -> None:
if name == "__main__.py": if name == "__main__.py":
spcd.set_ssh(*arguments) spcd.set_ssh(*arguments)
spcd.install_commands(main) spcd.install_commands(main)
# FIXME abstract command
step("Install packages")
run(
"apt-get",
"install",
"--assume-yes",
"python3-sphinx",
"python3-sphinx-rtd-theme",
)
else: else:
function = getattr(cmd, name.replace("-", "_")) function = getattr(cmd, name.replace("-", "_"))
function(*arguments) function(*arguments)