From 08b3738cfdaca43d19e188a1fd51d54d33fd5ae5 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 28 Dec 2022 21:44:18 +0800 Subject: [PATCH] up --- scripts/install.sh | 6 +++--- scripts/install/rhel.sh | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 4e34b67e6..29c5e53dd 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -28,16 +28,16 @@ elif grep -Eq "openSUSE" /etc/*-release; then zypper install cron wget curl zip unzip elif grep -Eq "FreeBSD" /etc/*-release; then OSNAME='freebsd' -elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/redhat-release; then +elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then OSNAME='rhel' yum install -y wget curl zip unzip tar crontabs elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then OSNAME='fedora' yum install -y wget curl zip unzip tar crontabs -elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/redhat-release; then +elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then OSNAME='rhel' yum install -y wget curl zip unzip tar crontabs -elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/redhat-release; then +elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then OSNAME='rhel' yum install -y wget curl zip unzip tar crontabs elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eq "Amazon Linux" /etc/*-release; then diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index e96faf9ac..1bc52bb8e 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -28,6 +28,7 @@ if [ ! -d /root/.acme.sh ];then curl https://get.acme.sh | sh fi +echo "iptables wrap start" if [ -f /usr/sbin/iptables ];then $PKGMGR install -y iptables-services @@ -55,6 +56,7 @@ if [ -f /usr/sbin/iptables ];then echo "iptables end" fi +echo "iptables wrap start" if [ ! -f /usr/sbin/iptables ];then $PKGMGR install firewalld -y