From 3a8c567bebbd63cc4c0cbdc5b230e622a4b2f85e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 24 Jun 2024 11:06:19 +0200 Subject: [PATCH] " | " --- pidd.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pidd.sh b/pidd.sh index 50d512c..a296a92 100644 --- a/pidd.sh +++ b/pidd.sh @@ -72,7 +72,7 @@ pidd_set_environment_variables() { esac # set operating system version case "${PIDD_OS_ID}" in - "${PIDD_OS_ALMA}"|"${PIDD_OS_ARCH}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_ARCH}" | "${PIDD_OS_FEDORA}" | "${PIDD_OS_ROCKY}") PIDD_OS_VERSION=$(pidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; @@ -80,46 +80,46 @@ pidd_set_environment_variables() { PIDD_OS_VERSION=$(pidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; - "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + "${PIDD_OS_DEBIAN}" | "${PIDD_OS_UBUNTU}") PIDD_OS_VERSION="$(pidd_grep_os VERSION_CODENAME)" ;; *) ;; esac # check operating system version case "${PIDD_OS_ID}" in - "${PIDD_OS_ALMA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_ROCKY}") case "${PIDD_OS_VERSION}" in - "8"|"9") ;; + "8" | "9") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; "${PIDD_OS_ALPINE}") case "${PIDD_OS_VERSION}" in - "3.18"|"3.19") ;; + "3.18" | "3.19") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; "${PIDD_OS_ARCH}") case "${PIDD_OS_VERSION}" in - "20231112"|"20240101") ;; + "20231112" | "20240101") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; "${PIDD_OS_DEBIAN}") case "${PIDD_OS_VERSION}" in - "bookworm"|"bullseye") ;; + "bookworm" | "bullseye") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; "${PIDD_OS_FEDORA}") case "${PIDD_OS_VERSION}" in - "39"|"40") ;; + "39" | "40") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; "${PIDD_OS_UBUNTU}") case "${PIDD_OS_VERSION}" in - "jammy"|"noble") ;; + "jammy" | "noble") ;; *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; @@ -138,7 +138,7 @@ pidd_set_environment_variables() { pidd_echo "PIDD_DNS_FILE" "PIDD_PKG_CA" "PIDD_PKG_GIT" "PIDD_PYTHON_ALIAS" # set ca command & root case "${PIDD_OS_ID}" in - "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_FEDORA}" | "${PIDD_OS_ROCKY}") PIDD_CA_ROOT="/etc/pki/ca-trust/source/anchors" PIDD_CMD_CA="update-ca-trust" ;; @@ -150,7 +150,7 @@ pidd_set_environment_variables() { PIDD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" PIDD_CMD_CA="update-ca-trust" ;; - "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + "${PIDD_OS_DEBIAN}" | "${PIDD_OS_UBUNTU}") PIDD_CA_ROOT="/usr/local/share/ca-certificates" PIDD_CMD_CA="update-ca-certificates" ;; @@ -163,10 +163,10 @@ pidd_set_environment_variables() { "${PIDD_OS_ALPINE}") PIDD_PM="${PIDD_PM_APK}" ;; - "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + "${PIDD_OS_DEBIAN}" | "${PIDD_OS_UBUNTU}") PIDD_PM="${PIDD_PM_APT}" ;; - "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_FEDORA}" | "${PIDD_OS_ROCKY}") PIDD_PM="${PIDD_PM_DNF}" ;; "${PIDD_OS_ARCH}") @@ -311,7 +311,7 @@ Acquire::https::Verify-Peer False; pidd_echo "PIDD_URL_DEFAULT" "PIDD_URL_CHOSEN" # set python command & package case "${PIDD_OS_ID}" in - "${PIDD_OS_ALMA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_ROCKY}") PIDD_PYTHON_COMMAND="python3.11" PIDD_PYTHON_PACKAGE="python3.11" ;; @@ -347,13 +347,13 @@ Acquire::https::Verify-Peer False; esac # set python packages case "${PIDD_OS_ID}" in - "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + "${PIDD_OS_ALMA}" | "${PIDD_OS_FEDORA}" | "${PIDD_OS_ROCKY}") PIDD_PYTHON_PACKAGES="/usr/lib64/${PIDD_PYTHON_COMMAND}/site-packages" ;; - "${PIDD_OS_ALPINE}"|"${PIDD_OS_ARCH}") + "${PIDD_OS_ALPINE}" | "${PIDD_OS_ARCH}") PIDD_PYTHON_PACKAGES="/usr/lib/${PIDD_PYTHON_COMMAND}/site-packages" ;; - "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + "${PIDD_OS_DEBIAN}" | "${PIDD_OS_UBUNTU}") PIDD_PYTHON_PACKAGES="/usr/lib/${PIDD_PYTHON_ALIAS}/dist-packages" ;; *) ;; @@ -436,7 +436,7 @@ Acquire::https::Verify-Peer False; "PIDD_PROJECT_PATH" "PIDD_PROJECT_NAME" "PIDD_PROJECT_BRANCH" # TODO move to Python case "${PIDD_PM}" in - "${PIDD_PM_APK}"|"${PIDD_PM_APT}") PIDD_PKG_SSH="openssh-client" ;; + "${PIDD_PM_APK}" | "${PIDD_PM_APT}") PIDD_PKG_SSH="openssh-client" ;; "${PIDD_PM_DNF}") PIDD_PKG_SSH="openssh-clients" ;; "${PIDD_PM_PACMAN}") PIDD_PKG_SSH="openssh" ;; *) ;; @@ -501,7 +501,7 @@ pidd_set_packages_configuration() { pidd_step "Set packages configuration" pidd_write "${PIDD_PM_CONF_PATH}" "${PIDD_PM_CONF_TEXT}" case "${PIDD_OS_ID}" in - "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + "${PIDD_OS_DEBIAN}" | "${PIDD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" ;; *) ;;