From 01fd83badf61af70128707b3f2d46f5271d944be Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 09:56:08 +0200 Subject: [PATCH 1/4] ShellCheck --- spcd.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index c2c1812..5975381 100644 --- a/spcd.sh +++ b/spcd.sh @@ -637,7 +637,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 From f73fda5e60710034d16784d5799b97677e9bbe91 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 10:00:39 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=E2=88=92fixme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd/__init__.py | 9 --------- 1 file changed, 9 deletions(-) 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) From 21ffd1ab79ca40e8e306e797534ed3749e309759 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 10:03:44 +0200 Subject: [PATCH 3/4] fedora/python3 --- spcd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd.sh b/spcd.sh index 5975381..20c63af 100644 --- a/spcd.sh +++ b/spcd.sh @@ -414,8 +414,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 From cd222bdeafd0aeb91348d74c49e3f2e1105895fb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 10:07:39 +0200 Subject: [PATCH 4/4] alpine/python3 --- spcd.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 20c63af..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}")