调整,为国内安装做准备。

scripts/install.sh

@@ -48,6 +48,23 @@ else
 	OSNAME='unknow'
 fi
 
+
+if [ $OSNAME != "macos" ];then
+	mkdir -p /www/server
+	mkdir -p /www/wwwroot
+	mkdir -p /www/wwwlogs
+	mkdir -p /www/backup/database
+	mkdir -p /www/backup/site
+
+	if [ ! -d /www/server/mdserver-web ];then
+		wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+		cd /tmp && unzip /tmp/master.zip
+		mv /tmp/mdserver-web-master /www/server/mdserver-web
+		rm -rf /tmp/master.zip
+		rm -rf /tmp/mdserver-web-master
+	fi
+fi
+
 echo "use system version: ${OSNAME}"
 curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install/${OSNAME}.sh | bash
 

scripts/install/alma.sh

@@ -3,11 +3,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=C.UTF-8
 
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
 
 
 if [ ! -f /usr/bin/applydeltarpm ];then

scripts/install/centos.sh

@@ -3,13 +3,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=en_US.UTF-8
 
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
-
-
 if [ ! -f /usr/bin/applydeltarpm ];then
 	yum -y provides '*/applydeltarpm'
 	yum -y install deltarpm
@@ -26,7 +19,6 @@ yum install -y vixie-cron
 yum install -y curl-devel libmcrypt libmcrypt-devel
 
 #https need
-
 if [ ! -d /root/.acme.sh ];then	
 	curl https://get.acme.sh | sh
 fi
@@ -83,27 +75,14 @@ yum install -y ncurses-devel mysql-devel cmake
 yum install -y MySQL-python 
 yum install -y epel-release
 
-if [ ! -d /www/server/mdserver-web ];then
-	wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-	cd /tmp && unzip /tmp/master.zip
-	mv /tmp/mdserver-web-master /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web-master
-fi
-
-#if [ ! -f '/usr/bin/pip' ];then
-#	wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
-#	python get-pip.py
-#	pip install --upgrade pip
-#	pip install pillow==6.2.2
-#fi 
-
 
 if [ ! -f /usr/local/bin/pip3 ];then
     python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple
 fi
 
 
+
+
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 

scripts/install/debian.sh

@@ -4,12 +4,6 @@ export PATH
 LANG=en_US.UTF-8
 
 
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
-
 apt update -y
 
 
@@ -66,15 +60,6 @@ fi
 systemctl stop firewalld
 
 
-if [ ! -d /www/server/mdserver-web ];then
-	wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-	cd /tmp && unzip /tmp/master.zip
-	mv /tmp/mdserver-web-master /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web-master
-fi 
-
-
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 

scripts/install/fedora.sh

@@ -3,12 +3,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=en_US.UTF-8
 
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
-
 
 if [ ! -f /usr/bin/applydeltarpm ];then
 	yum -y provides '*/applydeltarpm'
@@ -82,15 +76,7 @@ yum -y install ncurses-devel mysql-devel cmake
 yum -y install python-devel
 yum -y install MySQL-python 
 yum -y install epel-release
-yum -y install python36-devel
-
-if [ ! -d /www/server/mdserver-web ];then
-	wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-	cd /tmp && unzip /tmp/master.zip
-	mv /tmp/mdserver-web-master /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web-master
-fi 
+yum -y install python3-devel
 
 
 

scripts/install/rocky.sh

@@ -3,12 +3,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=en_US.UTF-8
 
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
-
 
 if [ ! -f /usr/bin/applydeltarpm ];then
 	yum -y provides '*/applydeltarpm'
@@ -82,14 +76,6 @@ yum install -y ncurses-devel mysql-devel cmake
 yum install -y MySQL-python 
 yum install -y epel-release
 
-if [ ! -d /www/server/mdserver-web ];then
-	wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-	cd /tmp && unzip /tmp/master.zip
-	mv /tmp/mdserver-web-master /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web-master
-fi
-
 #if [ ! -f '/usr/bin/pip' ];then
 #	wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
 #	python get-pip.py

scripts/install/ubuntu.sh

@@ -4,13 +4,6 @@ export PATH
 LANG=en_US.UTF-8
 
 
-
-mkdir -p /www/server
-mkdir -p /www/wwwroot
-mkdir -p /www/wwwlogs
-mkdir -p /www/backup/database
-mkdir -p /www/backup/site
-
 apt update -y
 
 apt install -y wget curl lsof unzip
@@ -64,14 +57,6 @@ fi
 #安装时不开启
 systemctl stop firewalld
 
-if [ ! -d /www/server/mdserver-web ];then
-	wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-	cd /tmp && unzip /tmp/master.zip
-	mv /tmp/mdserver-web-master /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web-master
-fi 
-
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data

scripts/update.sh

@@ -38,6 +38,12 @@ else
 	OSNAME='unknow'
 fi
 
+wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+cd /tmp && unzip /tmp/master.zip
+/usr/bin/cp -rf  /tmp/mdserver-web-master/* /www/server/mdserver-web
+rm -rf /tmp/master.zip
+rm -rf /tmp/mdserver-web-master
+
 #pip uninstall public
 echo "use system version: ${OSNAME}"
 curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update/${OSNAME}.sh | bash

scripts/update/alma.sh

@@ -10,14 +10,8 @@ fi
 
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 
-wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-cd /tmp && unzip /tmp/master.zip
-/usr/bin/cp -rf  /tmp/mdserver-web-master/* /www/server/mdserver-web
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
 
-
-yum install -y curl-devel libmcrypt libmcrypt-devel python36-devel
+yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data

scripts/update/centos.sh

@@ -10,14 +10,9 @@ fi
 
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 
-wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-cd /tmp && unzip /tmp/master.zip
-/usr/bin/cp -rf  /tmp/mdserver-web-master/* /www/server/mdserver-web
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
 
+yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
 
-yum install -y curl-devel libmcrypt libmcrypt-devel python36-devel
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data

scripts/update/debian.sh

@@ -5,13 +5,6 @@ LANG=en_US.UTF-8
 
 
 
-wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-rm -rf /tmp/mdserver-web-master
-cd /tmp && unzip  /tmp/master.zip
-cp -rf /tmp/mdserver-web-master/* /www/server/mdserver-web
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
-
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data

scripts/update/rocky.sh

@@ -10,11 +10,6 @@ fi
 
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 
-wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-cd /tmp && unzip /tmp/master.zip
-/usr/bin/cp -rf  /tmp/mdserver-web-master/* /www/server/mdserver-web
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
 
 
 yum install -y curl-devel libmcrypt libmcrypt-devel python36-devel

scripts/update/ubuntu.sh

@@ -4,13 +4,6 @@ export PATH
 LANG=en_US.UTF-8
 
 
-wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-rm -rf /tmp/mdserver-web-master
-cd /tmp && unzip  /tmp/master.zip
-cp -rf /tmp/mdserver-web-master/* /www/server/mdserver-web
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
-
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data