From dfe46332dbbdda27d1f6419baa75a4bc0baa3139 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 5 May 2023 22:49:39 +0800 Subject: [PATCH] up --- scripts/install.sh | 2 +- scripts/install/centos.sh | 4 +++- scripts/install/fedora.sh | 2 +- scripts/install_dev.sh | 2 +- scripts/update.sh | 8 ++++---- scripts/update_dev.sh | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 756826016..9d470bca5 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -32,7 +32,7 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then OSNAME='rhel' yum install -y wget curl zip unzip tar crontabs elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then - OSNAME='fedora' + OSNAME='rhel' yum install -y wget curl zip unzip tar crontabs elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then OSNAME='rhel' diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index b6d959047..57fe01264 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -18,7 +18,9 @@ yum install -y python3-devel yum install -y python3-pip yum install -y python-devel yum install -y vixie-cron -yum install -y curl-devel libmcrypt libmcrypt-devel +yum install -y curl-devel +yum install -y libmcrypt +yum install -y libmcrypt-devel yum install -y mysql-devel yum install -y expect diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 2349e2987..97ac1520d 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -68,7 +68,7 @@ yum install -y epel-release yum install -y libevent libevent-devel zip libmcrypt libmcrypt-devel yum install -y gcc libffi-devel python-devel openssl-devel -yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel +yum install -y libmcrypt libmcrypt-devel python3-devel yum install -y wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel crontabs yum install -y net-tools diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index 99cbf2de8..8455b0c48 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -36,7 +36,7 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then - OSNAME='fedora' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then OSNAME='rhel' diff --git a/scripts/update.sh b/scripts/update.sh index 7a0799b4e..be2c37cab 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -28,16 +28,16 @@ elif grep -Eqi "openSUSE" /etc/*-release; then elif grep -Eqi "FreeBSD" /etc/*-release; then OSNAME='freebsd' elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then - OSNAME='centos' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then - OSNAME='fedora' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then - OSNAME='rocky' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then - OSNAME='alma' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then OSNAME='amazon' diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 8c38e0aca..024b9ecc2 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -31,13 +31,13 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then OSNAME='centos' yum install -y wget zip unzip elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then - OSNAME='fedora' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then - OSNAME='rocky' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then - OSNAME='alma' + OSNAME='rhel' yum install -y wget zip unzip elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then OSNAME='amazon'