From 1cb7bb73d1a0cd69ce903e6efef457884fff6353 Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Tue, 10 Jan 2023 16:02:41 +0800 Subject: [PATCH 1/2] support arch based OS manjaro --- install.sh | 2 +- update.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 3220ce5..424c3d4 100644 --- a/install.sh +++ b/install.sh @@ -72,7 +72,7 @@ elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhe # || [ "${UPSTREAM_ID}" = "suse" ] sudo yum update -y sudo yum install -y ${PREREQ} ${PREREQRPM} # git -elif [ "${ID}" = "arch" ]; then +elif [ "${ID}" = "arch" ] || [ "${ID}" = "manjaro" ]; then sudo pacman -Syu sudo pacman -S ${PREREQ} ${PREREQARCH} else diff --git a/update.sh b/update.sh index 67e188e..46f060f 100644 --- a/update.sh +++ b/update.sh @@ -73,6 +73,9 @@ elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhe # || [ "${UPSTREAM_ID}" = "suse" ] sudo yum update -y sudo yum install -y ${PREREQ} ${PREREQRPM} # git +elif [ "${ID}" = "arch" ] || [ "${ID}" = "manjaro" ]; then + sudo pacman -Syu + sudo pacman -S ${PREREQ} ${PREREQARCH} else echo "Unsupported OS" # here you could ask the user for permission to try and install anyway From e617f99fb8f087bde21bb844856688987e8e3cff Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Tue, 10 Jan 2023 16:59:33 +0800 Subject: [PATCH 2/2] optimize arch based OS judge --- install.sh | 2 +- update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 424c3d4..749c8f1 100644 --- a/install.sh +++ b/install.sh @@ -72,7 +72,7 @@ elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhe # || [ "${UPSTREAM_ID}" = "suse" ] sudo yum update -y sudo yum install -y ${PREREQ} ${PREREQRPM} # git -elif [ "${ID}" = "arch" ] || [ "${ID}" = "manjaro" ]; then +elif [ "${ID}" = "arch" ] || [ "${UPSTREAM_ID}" = "arch" ]; then sudo pacman -Syu sudo pacman -S ${PREREQ} ${PREREQARCH} else diff --git a/update.sh b/update.sh index 46f060f..50de8c2 100644 --- a/update.sh +++ b/update.sh @@ -73,7 +73,7 @@ elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhe # || [ "${UPSTREAM_ID}" = "suse" ] sudo yum update -y sudo yum install -y ${PREREQ} ${PREREQRPM} # git -elif [ "${ID}" = "arch" ] || [ "${ID}" = "manjaro" ]; then +elif [ "${ID}" = "arch" ] || [ "${UPSTREAM_ID}" = "arch" ]; then sudo pacman -Syu sudo pacman -S ${PREREQ} ${PREREQARCH} else