readme.md

@@ -60,20 +60,20 @@ from various contexts of CA, CI and OCI / OS.
 
 ## Packages
 
-| os              | s | u | python      | grviz | plantuml  | shch | spx | shfm | ruf |
+| os              | s | u | python      | gviz | plantuml  | shch | spx | shf | ruf |
-|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----|
+|:----------------|---|---|:------------|:-----|:----------|:-----|:----|:----|:----|
 | Arch 20240101   | ☑ | ☑ | 3.12        | 12.0 | 1.2023.13 | 0.10 | 7.4 | 3.8 | 0.5 |
 | Fedora 40       | ☑ | ☑ | 3.12 → 3.13 | 9.0  | 1.2024.6  | 0.9  | 7.2 | 3.7 | 0.4 |
 | Alpine 3.20     | ☑ | ☐ | 3.12        | 9.0  | 1.2024.4  | 0.10 | 7.2 | 3.8 | 0.4 |
-| Ubuntu Noble    | ☐ | ☐ | 3.12        | u2.42 | u1.2020.2 | u0.9 | 7.2 | u3.8 |     |
+| Ubuntu Noble    | ☐ | ☐ | 3.12        | 2.42 | 1.2020.2  | 0.9  | 7.2 | 3.8 |     |
 | Debian Bookworm | ☐ | ☐ | 3.11        | 2.42 | 1.2020.2  | 0.9  | 5.3 | 3.6 |     |
 | Alma / Rocky 9  | ☑ | ☑ | 3.9  → 3.12 | 2.44 | e1.2024.6 | e0.8 |     |     |     |
 
-| os              | s | u | python      | grviz | plantuml  | shch | spx | shfm | ruf |
+| os              | s | u | python      | gviz | plantuml  | shch | spx | shf | ruf |
-|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----|
+|:----------------|---|---|:------------|:-----|:----------|:-----|:----|:----|:----|
 | Fedora 39       | ☑ | ☑ | 3.12 → 3.13 | 8.1  | 1.2024.6  | 0.9  | 6.2 | 3.5 | 0.4 |
 | Alpine 3.19     | ☑ | ☐ | 3.11        | 9.0  | 1.2023.12 | 0.9  | 6.2 | 3.7 |     |
-| Ubuntu Jammy    | ☐ | ☐ | 3.10        | u2.42 | u1.2020.2 | u0.8 | 4.3 | u3.4 |     |
+| Ubuntu Jammy    | ☐ | ☐ | 3.10        | 2.42 | 1.2020.2  | 0.8  | 4.3 | 3.4 |     |
 | Debian Bullseye | ☐ | ☐ | 3.9         | 2.42 | 1.2020.2  | 0.7  | 3.4 |     |     |
 | Alma / Rocky 8  | ☑ | ☑ | 3.6  → 3.12 | 2.40 | e1.2024.6 | e0.6 |     |     |     |
 

spcd.sh

@@ -66,8 +66,7 @@ spcd_set_environment_variables() {
 			SPCD_PROJECT_ROOT="$(dirname "${GITHUB_SERVER_URL}")//"
 			[ -n "${GITHUB_TOKEN}" ] &&
 				SPCD_PROJECT_ROOT="${SPCD_PROJECT_ROOT}${GITHUB_TOKEN}@"
-			SPCD_PROJECT_ROOT="\
+			SPCD_PROJECT_ROOT="${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
-${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
 		else
 			spcd_error_ci "GITHUB_SERVER_URL"
 		fi
@@ -129,9 +128,7 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
 	fi
 	# check project variables
 	case "${SPCD_PROJECT_BRANCH}" in
-	"${SPCD_BRANCH_RELEASE}" | \
+	"${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}" | "${SPCD_BRANCH_FEATURE}") ;;
-		"${SPCD_BRANCH_STAGING}" | \
-		"${SPCD_BRANCH_FEATURE}") ;;
 	*) spcd_error_ci "SPCD_PROJECT_BRANCH" ;;
 	esac
 	[ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT"
@@ -609,9 +606,7 @@ spcd_install_packages() {
 	# epel
 	spcd_step "Install EPEL"
 	case "${SPCD_OS_ID}" in
-	"${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
+	"${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") spcd_install_package "epel-release" ;;
-		spcd_install_package "epel-release"
-		;;
 	*) ;;
 	esac
 	# graphviz
@@ -644,16 +639,7 @@ spcd_install_packages() {
 	# rsync
 	spcd_step "Install Rsync"
 	spcd_install_package "rsync"
-	# ruff
+	# shellcheck
-	spcd_step "Install Ruff"
-	case "${SPCD_OS_ID}" in
-	"${SPCD_OS_ALPINE}")
-		[ "${SPCD_OS_VERSION}" != "3.19" ] && spcd_install_package "ruff"
-		;;
-	"${SPCD_OS_ARCH}" | "${SPCD_OS_FEDORA}") spcd_install_package "ruff" ;;
-	*) ;;
-	esac
-	# shell check
 	spcd_step "Install ShellCheck"
 	case "${SPCD_PM}" in
 	"${SPCD_PM_DNF}") spcd_install_package "ShellCheck" ;;
@@ -663,17 +649,12 @@ spcd_install_packages() {
 	spcd_step "Install ShellFormat"
 	case "${SPCD_OS_ID}" in
 	"${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;;
-	"${SPCD_OS_DEBIAN}")
-		[ "${SPCD_OS_VERSION}" != "bullseye" ] && spcd_install_package "shfmt"
-		;;
 	*) spcd_install_package "shfmt" ;;
 	esac
 	# ssh
 	spcd_step "Install SSH"
 	case "${SPCD_PM}" in
-	"${SPCD_PM_APK}" | "${SPCD_PM_APT}")
+	"${SPCD_PM_APK}" | "${SPCD_PM_APT}") spcd_install_package "openssh-client" ;;
-		spcd_install_package "openssh-client"
-		;;
 	"${SPCD_PM_DNF}") spcd_install_package "openssh-clients" ;;
 	"${SPCD_PM_PACMAN}") spcd_install_package "openssh" ;;
 	*) ;;