From 8c0698c298192d7e1132b31c8649fa92bde878a7 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 20 Jun 2022 23:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4,=E4=B8=BA=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=81=9A=E5=87=86=E5=A4=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install.sh | 17 +++++++++++++++++ scripts/install/alma.sh | 5 ----- scripts/install/centos.sh | 25 ++----------------------- scripts/install/debian.sh | 15 --------------- scripts/install/fedora.sh | 16 +--------------- scripts/install/rocky.sh | 14 -------------- scripts/install/ubuntu.sh | 15 --------------- scripts/update.sh | 6 ++++++ scripts/update/alma.sh | 8 +------- scripts/update/centos.sh | 7 +------ scripts/update/debian.sh | 7 ------- scripts/update/rocky.sh | 5 ----- scripts/update/ubuntu.sh | 7 ------- 13 files changed, 28 insertions(+), 119 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index a2aff5817..bb25c5079 100755 --- a/scripts/install.sh +++ b/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 diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index afb286868..c4d890e00 100755 --- a/scripts/install/alma.sh +++ b/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 diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index abe61ee96..e307d6dda 100755 --- a/scripts/install/centos.sh +++ b/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 diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index 769e2fbc0..d1a7d884c 100644 --- a/scripts/install/debian.sh +++ b/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 diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 44b9ba7c5..3b647208b 100644 --- a/scripts/install/fedora.sh +++ b/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 diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index 591e37696..5056eef20 100644 --- a/scripts/install/rocky.sh +++ b/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 diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 282efe9c0..c31c99d45 100644 --- a/scripts/install/ubuntu.sh +++ b/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 diff --git a/scripts/update.sh b/scripts/update.sh index 12ba7f503..a6207ac58 100755 --- a/scripts/update.sh +++ b/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 diff --git a/scripts/update/alma.sh b/scripts/update/alma.sh index e5c18ec48..a5f2cf78f 100755 --- a/scripts/update/alma.sh +++ b/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 diff --git a/scripts/update/centos.sh b/scripts/update/centos.sh index 5cf933a59..6f1f75252 100755 --- a/scripts/update/centos.sh +++ b/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 diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index 28de6f74b..a3eb1d282 100644 --- a/scripts/update/debian.sh +++ b/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 diff --git a/scripts/update/rocky.sh b/scripts/update/rocky.sh index 5cf933a59..bca02d51a 100755 --- a/scripts/update/rocky.sh +++ b/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 diff --git a/scripts/update/ubuntu.sh b/scripts/update/ubuntu.sh index cd89065cc..1fb1bf7cc 100644 --- a/scripts/update/ubuntu.sh +++ b/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