From 269fd07c5fdc5e8be0d924c1ec768d4ec4934d19 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 22 Jun 2022 03:29:22 +0800
Subject: [PATCH] =?UTF-8?q?alma=20=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install/alma.sh | 42 +++++++++++++++++------------------------
 scripts/update/alma.sh  |  1 -
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh
index 640279487..da07497cf 100755
--- a/scripts/install/alma.sh
+++ b/scripts/install/alma.sh
@@ -5,19 +5,13 @@ LANG=C.UTF-8
 
 
 
-if [ ! -f /usr/bin/applydeltarpm ];then
-	yum -y provides '*/applydeltarpm'
-	yum -y install deltarpm
-fi
-
-
 setenforce 0
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 
-yum install -y wget lsof crontabs
-yum install -y python3-devel
-yum install -y python-devel
-yum install -y vixie-cron
+dnf install -y wget lsof
+dnf install -y python3-devel
+dnf install -y python-devel
+dnf install -y crontabs
 
 #https need
 
@@ -68,22 +62,20 @@ fi
 #安装时不开启
 systemctl stop firewalld
 
-yum groupinstall -y "Development Tools"
-yum install -y epel-release
+dnf upgrade -y
+dnf autoremove -y
 
-yum install -y oniguruma oniguruma-devel
-#use dnf
-if [ "$?" != "0" ];then
-	yum install -y dnf dnf-plugins-core
-	dnf config-manager --set-enabled powertools
-	yum install -y oniguruma oniguruma-devel
-fi
+dnf groupinstall -y "Development Tools"
+dnf install -y epel-release
+
+dnf install -y oniguruma
+dnf --enablerepo=crb install oniguruma-devel
 
-yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip libmcrypt libmcrypt-devel
-yum install -y wget python-imaging libicu-devel zip bzip2-devel gcc libxml2 libxml2-dev  libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel
-yum install -y lsof net-tools
-yum install -y ncurses-devel mysql-devel cmake
-yum install -y MySQL-python 
+dnf install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip libmcrypt libmcrypt-devel
+dnf install -y wget libicu-devel zip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel
+dnf install -y lsof net-tools
+dnf install -y ncurses-devel cmake
+dnf --enablerepo=crb install mysql-devel
 
 
 
@@ -95,7 +87,7 @@ if [ ! -f /usr/local/bin/pip3 ];then
     python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple
 fi
 
-sed -i  "/mysqlclient/d" /www/server/mdserver-web/requirements.txt
+
 pip install --upgrade pip
 cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
 pip3 install gunicorn==20.1.0
diff --git a/scripts/update/alma.sh b/scripts/update/alma.sh
index 5b8b20721..fa4542ef1 100755
--- a/scripts/update/alma.sh
+++ b/scripts/update/alma.sh
@@ -21,7 +21,6 @@ if [ ! -f /usr/local/bin/pip3 ];then
 fi
 
 
-sed -i  "/mysqlclient/d" /www/server/mdserver-web/requirements.txt
 pip install --upgrade pip
 cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
 pip3 install flask-socketio==5.2.0