From 1996cb03ce1f00170885153725c5e74affabe1e1 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 9 Nov 2023 01:32:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E7=89=88mac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/mariadb/info.json | 2 +- plugins/mariadb/install.sh | 2 +- plugins/mariadb/versions/10.11/install.sh | 11 +- plugins/mariadb/versions/10.6/install.sh | 11 +- plugins/mariadb/versions/10.7/install.sh | 11 +- plugins/mariadb/versions/10.8/install.sh | 11 +- plugins/mariadb/versions/10.9/install.sh | 11 +- plugins/mariadb/versions/11.0/install.sh | 14 ++- plugins/mariadb/versions/11.1/install.sh | 129 +++++++++++++++++++++ plugins/mariadb/versions/11.2/install.sh | 129 +++++++++++++++++++++ plugins/mariadb/versions/11.3/install.sh | 129 +++++++++++++++++++++ plugins/memcached/install.sh | 20 +++- plugins/mongodb/install.sh | 6 +- plugins/mongodb/versions/4.4/centos.sh | 2 +- plugins/mongodb/versions/4.4/debian.sh | 2 +- plugins/mongodb/versions/4.4/macos.sh | 2 +- plugins/mongodb/versions/4.4/opensuse.sh | 2 +- plugins/mongodb/versions/4.4/rhel.sh | 2 +- plugins/mongodb/versions/4.4/ubuntu.sh | 2 +- plugins/mongodb/versions/5.0/centos.sh | 2 +- plugins/mongodb/versions/5.0/debian.sh | 2 +- plugins/mongodb/versions/5.0/macos.sh | 2 +- plugins/mongodb/versions/5.0/opensuse.sh | 2 +- plugins/mongodb/versions/5.0/ubuntu.sh | 2 +- plugins/mongodb/versions/6.0/centos.sh | 2 +- plugins/mongodb/versions/6.0/debian.sh | 2 +- plugins/mongodb/versions/6.0/macos.sh | 2 +- plugins/mongodb/versions/6.0/opensuse.sh | 2 +- plugins/mongodb/versions/6.0/ubuntu.sh | 2 +- plugins/mongodb/versions/7.0/centos.sh | 2 +- plugins/mongodb/versions/7.0/debian.sh | 2 +- plugins/mongodb/versions/7.0/macos.sh | 2 +- plugins/mongodb/versions/7.0/opensuse.sh | 2 +- plugins/mongodb/versions/7.0/ubuntu.sh | 2 +- plugins/mysql/install.sh | 2 +- plugins/mysql/versions/5.5/install.sh | 6 +- plugins/mysql/versions/5.6/install.sh | 7 +- plugins/mysql/versions/5.7/install.sh | 7 +- plugins/mysql/versions/8.0/install.sh | 7 +- plugins/openresty/index.py | 46 +++++--- plugins/openresty/info.json | 4 +- plugins/openresty/init.d/nginx.tpl | 2 +- plugins/openresty/install.sh | 59 +++++++++- plugins/php/install.sh | 2 +- plugins/php/lib/freetype_new.sh | 2 +- plugins/php/lib/freetype_old.sh | 2 +- plugins/php/lib/icu.sh | 2 +- plugins/php/lib/libiconv.sh | 2 +- plugins/php/lib/libmcrypt.sh | 2 +- plugins/php/lib/libmemcached.sh | 2 +- plugins/php/lib/libsodium.sh | 2 +- plugins/php/lib/libzip.sh | 9 +- plugins/php/lib/oniguruma.sh | 2 +- plugins/php/lib/openssl.sh | 2 +- plugins/php/lib/openssl_10.sh | 2 +- plugins/php/lib/openssl_11.sh | 2 +- plugins/php/lib/zlib.sh | 14 ++- plugins/php/versions/52/eaccelerator.sh | 2 +- plugins/php/versions/52/gd.sh | 2 +- plugins/php/versions/52/install.sh | 2 +- plugins/php/versions/52/intl.sh | 2 +- plugins/php/versions/52/memcache.sh | 2 +- plugins/php/versions/52/zendoptimizer.sh | 2 +- plugins/php/versions/53/apc.sh | 2 +- plugins/php/versions/53/eaccelerator.sh | 2 +- plugins/php/versions/53/install.sh | 2 +- plugins/php/versions/53/intl.sh | 2 +- plugins/php/versions/53/opcache.sh | 2 +- plugins/php/versions/53/zendguardloader.sh | 2 +- plugins/php/versions/54/apc.sh | 2 +- plugins/php/versions/54/install.sh | 2 +- plugins/php/versions/54/opcache.sh | 2 +- plugins/php/versions/54/zendguardloader.sh | 2 +- plugins/php/versions/55/install.sh | 2 +- plugins/php/versions/56/install.sh | 2 +- plugins/php/versions/56/zendguardloader.sh | 2 +- plugins/php/versions/70/install.sh | 2 +- plugins/php/versions/71/install.sh | 2 +- plugins/php/versions/71/mcrypt.sh | 2 +- plugins/php/versions/72/install.sh | 2 +- plugins/php/versions/73/install.sh | 2 +- plugins/php/versions/80/install.sh | 2 +- plugins/php/versions/81/install.sh | 2 +- plugins/php/versions/82/install.sh | 2 +- plugins/php/versions/83/install.sh | 2 +- plugins/php/versions/all_test.sh | 2 +- plugins/php/versions/common.sh | 2 +- plugins/php/versions/common/apcu.sh | 2 +- plugins/php/versions/common/bcmath.sh | 2 +- plugins/php/versions/common/exif.sh | 2 +- plugins/php/versions/common/fileinfo.sh | 2 +- plugins/php/versions/common/gd.sh | 2 +- plugins/php/versions/common/gd_old.sh | 2 +- plugins/php/versions/common/gettext.sh | 2 +- plugins/php/versions/common/gmp.sh | 2 +- plugins/php/versions/common/iconv.sh | 2 +- plugins/php/versions/common/igbinary.sh | 2 +- plugins/php/versions/common/imagemagick.sh | 2 +- plugins/php/versions/common/intl.sh | 2 +- plugins/php/versions/common/ioncube.sh | 2 +- plugins/php/versions/common/mcrypt.sh | 2 +- plugins/php/versions/common/memcache.sh | 2 +- plugins/php/versions/common/memcached.sh | 2 +- plugins/php/versions/common/mongo.sh | 2 +- plugins/php/versions/common/mongodb.sh | 2 +- plugins/php/versions/common/opcache.sh | 2 +- plugins/php/versions/common/openssl.sh | 2 +- plugins/php/versions/common/pcntl.sh | 2 +- plugins/php/versions/common/phalcon.sh | 2 +- plugins/php/versions/common/redis.sh | 2 +- plugins/php/versions/common/seaslog.sh | 2 +- plugins/php/versions/common/sg11.sh | 2 +- plugins/php/versions/common/sodium.sh | 2 +- plugins/php/versions/common/solr.sh | 2 +- plugins/php/versions/common/swoole.sh | 2 +- plugins/php/versions/common/xdebug.sh | 2 +- plugins/php/versions/common/xhprof.sh | 2 +- plugins/php/versions/common/yac.sh | 2 +- plugins/php/versions/common/yaf.sh | 2 +- plugins/php/versions/common/yaml.sh | 2 +- plugins/php/versions/common/yar.sh | 2 +- plugins/php/versions/common/zip.sh | 2 +- plugins/php/versions/common/zlib.sh | 2 +- plugins/php/versions/lib.sh | 2 +- plugins/redis/install.sh | 19 ++- plugins/sphinx/install.sh | 2 +- scripts/getos.sh | 2 +- scripts/install.sh | 2 +- scripts/install/alma.sh | 2 +- scripts/install/amazon.sh | 2 +- scripts/install/arch.sh | 2 +- scripts/install/centos.sh | 2 +- scripts/install/debian.sh | 2 +- scripts/install/euler.sh | 2 +- scripts/install/fedora.sh | 2 +- scripts/install/freebsd.sh | 2 +- scripts/install/macos.sh | 3 +- scripts/install/opensuse.sh | 2 +- scripts/install/rhel.sh | 2 +- scripts/install/rocky.sh | 2 +- scripts/install/ubuntu.sh | 2 +- scripts/install/unknow.sh | 2 +- scripts/install_dev.sh | 2 +- scripts/lib.sh | 2 +- scripts/pick.sh | 2 +- scripts/plugin_compress.sh | 2 +- scripts/quick/app.sh | 2 +- scripts/quick/debug.sh | 2 +- scripts/rememory.sh | 2 +- scripts/update.sh | 2 +- scripts/update/alma.sh | 2 +- scripts/update/amazon.sh | 2 +- scripts/update/arch.sh | 2 +- scripts/update/centos.sh | 2 +- scripts/update/debian.sh | 2 +- scripts/update/euler.sh | 2 +- scripts/update/fedora.sh | 2 +- scripts/update/freebsd.sh | 2 +- scripts/update/macos.sh | 2 +- scripts/update/opensuse.sh | 2 +- scripts/update/rhel.sh | 2 +- scripts/update/rocky.sh | 2 +- scripts/update/ubuntu.sh | 2 +- scripts/update/unknow.sh | 2 +- scripts/update_dev.sh | 2 +- 165 files changed, 713 insertions(+), 236 deletions(-) create mode 100755 plugins/mariadb/versions/11.1/install.sh create mode 100755 plugins/mariadb/versions/11.2/install.sh create mode 100755 plugins/mariadb/versions/11.3/install.sh diff --git a/plugins/mariadb/info.json b/plugins/mariadb/info.json index a0767c823..acf7ac203 100755 --- a/plugins/mariadb/info.json +++ b/plugins/mariadb/info.json @@ -8,7 +8,7 @@ "uninstall_pre_inspection":true, "checks": "server/mariadb", "path": "server/mariadb", - "versions":["10.6","10.7","10.8","10.9","10.11","11.0"], + "versions":["10.6","10.7","10.8","10.9","10.11","11.0","11.1","11.2","11.3"], "shell":"install.sh", "checks":"server/mariadb", "path":"server/mariadb", diff --git a/plugins/mariadb/install.sh b/plugins/mariadb/install.sh index def4d2865..75e693ed7 100755 --- a/plugins/mariadb/install.sh +++ b/plugins/mariadb/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mariadb/versions/10.11/install.sh b/plugins/mariadb/versions/10.11/install.sh index d28e7d25c..a433e5431 100755 --- a/plugins/mariadb/versions/10.11/install.sh +++ b/plugins/mariadb/versions/10.11/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -102,16 +102,17 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.11' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi } Uninstall_app() diff --git a/plugins/mariadb/versions/10.6/install.sh b/plugins/mariadb/versions/10.6/install.sh index 9772e8c0a..ee514a658 100755 --- a/plugins/mariadb/versions/10.6/install.sh +++ b/plugins/mariadb/versions/10.6/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # https://mariadb.org/download/?t=mariadb @@ -105,16 +105,17 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.6' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi } Uninstall_app() diff --git a/plugins/mariadb/versions/10.7/install.sh b/plugins/mariadb/versions/10.7/install.sh index 2a8112c3f..ce95d8159 100755 --- a/plugins/mariadb/versions/10.7/install.sh +++ b/plugins/mariadb/versions/10.7/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -92,16 +92,17 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.7' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi } Uninstall_app() diff --git a/plugins/mariadb/versions/10.8/install.sh b/plugins/mariadb/versions/10.8/install.sh index 895a767d4..091b5cf35 100755 --- a/plugins/mariadb/versions/10.8/install.sh +++ b/plugins/mariadb/versions/10.8/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -92,16 +92,17 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.8' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi } Uninstall_app() diff --git a/plugins/mariadb/versions/10.9/install.sh b/plugins/mariadb/versions/10.9/install.sh index c1238c09a..a41092daa 100755 --- a/plugins/mariadb/versions/10.9/install.sh +++ b/plugins/mariadb/versions/10.9/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -102,16 +102,17 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.9' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi } Uninstall_app() diff --git a/plugins/mariadb/versions/11.0/install.sh b/plugins/mariadb/versions/11.0/install.sh index 291d2aceb..870c51d25 100755 --- a/plugins/mariadb/versions/11.0/install.sh +++ b/plugins/mariadb/versions/11.0/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -14,7 +14,7 @@ sysName=`uname` install_tmp=${rootPath}/tmp/mw_install.pl mariadbDir=${serverPath}/source/mariadb -MY_VER=11.0.1 +MY_VER=11.0.3 Install_app() { @@ -101,16 +101,18 @@ Install_app() if [ -d $serverPath/mariadb ];then echo '10.11' > $serverPath/mariadb/version.pl - echo '安装完成' > $install_tmp + echo '安装完成' else - echo '安装失败' > $install_tmp + echo '安装失败' echo 'install fail'>&2 exit 1 fi fi - rm -rf ${mariadbDir}/mariadb-${MY_VER} - rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi + } Uninstall_app() diff --git a/plugins/mariadb/versions/11.1/install.sh b/plugins/mariadb/versions/11.1/install.sh new file mode 100755 index 000000000..53f0b5fc9 --- /dev/null +++ b/plugins/mariadb/versions/11.1/install.sh @@ -0,0 +1,129 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin +export PATH + +#https://dev.mysql.com/downloads/mysql/5.5.html#downloads +#https://dev.mysql.com/downloads/file/?id=480541 + +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +serverPath=$(dirname "$rootPath") +sysName=`uname` + +install_tmp=${rootPath}/tmp/mw_install.pl +mariadbDir=${serverPath}/source/mariadb + +MY_VER=11.1.2 + +Install_app() +{ + mkdir -p ${mariadbDir} + echo '正在安装脚本文件...' > $install_tmp + + if id mysql &> /dev/null ;then + echo "mysql uid is `id -u www`" + echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `" + else + groupadd mysql + useradd -g mysql mysql + fi + + if [ "$sysName" != "Darwin" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + fi + + # ----- cpu start ------ + if [ -z "${cpuCore}" ]; then + cpuCore="1" + fi + + if [ -f /proc/cpuinfo ];then + cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l` + fi + + MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}') + if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then + if [ "${cpuCore}" -gt "${MEM_INFO}" ];then + cpuCore="${MEM_INFO}" + fi + else + cpuCore="1" + fi + + if [ "$cpuCore" -gt "2" ];then + cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'` + else + cpuCore="1" + fi + # ----- cpu end ------ + + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi + + # https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + fi + + if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then + cd ${mariadbDir} && tar -zxvf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + fi + + INSTALL_CMD=cmake + # check cmake version + CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'` + if [ "$CMAKE_VERSION" -eq "2" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + INSTALL_CMD=cmake3 + fi + + if [ ! -d $serverPath/mariadb ];then + cd ${mariadbDir}/mariadb-${MY_VER} && ${INSTALL_CMD} \ + -DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \ + -DMYSQL_DATADIR=$serverPath/mariadb/data/ \ + -DMYSQL_USER=mysql \ + -DMYSQL_UNIX_ADDR=$serverPath/mariadb/mysql.sock \ + -DWITH_MYISAM_STORAGE_ENGINE=1 \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_MEMORY_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DEXTRA_CHARSETS=all \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DCMAKE_C_COMPILER=/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++ + make -j${cpuCore} && make install && make clean + + if [ -d $serverPath/mariadb ];then + echo '10.11' > $serverPath/mariadb/version.pl + echo '安装完成' + else + echo '安装失败' + echo 'install fail'>&2 + exit 1 + fi + fi + + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi + +} + +Uninstall_app() +{ + rm -rf $serverPath/mariadb + echo '卸载完成' > $install_tmp +} + +action=$1 +if [ "${1}" == 'install' ];then + Install_app +else + Uninstall_app +fi diff --git a/plugins/mariadb/versions/11.2/install.sh b/plugins/mariadb/versions/11.2/install.sh new file mode 100755 index 000000000..e51bc6342 --- /dev/null +++ b/plugins/mariadb/versions/11.2/install.sh @@ -0,0 +1,129 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin +export PATH + +#https://dev.mysql.com/downloads/mysql/5.5.html#downloads +#https://dev.mysql.com/downloads/file/?id=480541 + +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +serverPath=$(dirname "$rootPath") +sysName=`uname` + +install_tmp=${rootPath}/tmp/mw_install.pl +mariadbDir=${serverPath}/source/mariadb + +MY_VER=11.2.1 + +Install_app() +{ + mkdir -p ${mariadbDir} + echo '正在安装脚本文件...' > $install_tmp + + if id mysql &> /dev/null ;then + echo "mysql uid is `id -u www`" + echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `" + else + groupadd mysql + useradd -g mysql mysql + fi + + if [ "$sysName" != "Darwin" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + fi + + # ----- cpu start ------ + if [ -z "${cpuCore}" ]; then + cpuCore="1" + fi + + if [ -f /proc/cpuinfo ];then + cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l` + fi + + MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}') + if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then + if [ "${cpuCore}" -gt "${MEM_INFO}" ];then + cpuCore="${MEM_INFO}" + fi + else + cpuCore="1" + fi + + if [ "$cpuCore" -gt "2" ];then + cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'` + else + cpuCore="1" + fi + # ----- cpu end ------ + + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi + + # https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + fi + + if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then + cd ${mariadbDir} && tar -zxvf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + fi + + INSTALL_CMD=cmake + # check cmake version + CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'` + if [ "$CMAKE_VERSION" -eq "2" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + INSTALL_CMD=cmake3 + fi + + if [ ! -d $serverPath/mariadb ];then + cd ${mariadbDir}/mariadb-${MY_VER} && ${INSTALL_CMD} \ + -DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \ + -DMYSQL_DATADIR=$serverPath/mariadb/data/ \ + -DMYSQL_USER=mysql \ + -DMYSQL_UNIX_ADDR=$serverPath/mariadb/mysql.sock \ + -DWITH_MYISAM_STORAGE_ENGINE=1 \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_MEMORY_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DEXTRA_CHARSETS=all \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DCMAKE_C_COMPILER=/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++ + make -j${cpuCore} && make install && make clean + + if [ -d $serverPath/mariadb ];then + echo '10.11' > $serverPath/mariadb/version.pl + echo '安装完成' + else + echo '安装失败' + echo 'install fail'>&2 + exit 1 + fi + fi + + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi + +} + +Uninstall_app() +{ + rm -rf $serverPath/mariadb + echo '卸载完成' > $install_tmp +} + +action=$1 +if [ "${1}" == 'install' ];then + Install_app +else + Uninstall_app +fi diff --git a/plugins/mariadb/versions/11.3/install.sh b/plugins/mariadb/versions/11.3/install.sh new file mode 100755 index 000000000..d21d226ee --- /dev/null +++ b/plugins/mariadb/versions/11.3/install.sh @@ -0,0 +1,129 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin +export PATH + +#https://dev.mysql.com/downloads/mysql/5.5.html#downloads +#https://dev.mysql.com/downloads/file/?id=480541 + +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +serverPath=$(dirname "$rootPath") +sysName=`uname` + +install_tmp=${rootPath}/tmp/mw_install.pl +mariadbDir=${serverPath}/source/mariadb + +MY_VER=11.3.0 + +Install_app() +{ + mkdir -p ${mariadbDir} + echo '正在安装脚本文件...' > $install_tmp + + if id mysql &> /dev/null ;then + echo "mysql uid is `id -u www`" + echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `" + else + groupadd mysql + useradd -g mysql mysql + fi + + if [ "$sysName" != "Darwin" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + fi + + # ----- cpu start ------ + if [ -z "${cpuCore}" ]; then + cpuCore="1" + fi + + if [ -f /proc/cpuinfo ];then + cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l` + fi + + MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}') + if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then + if [ "${cpuCore}" -gt "${MEM_INFO}" ];then + cpuCore="${MEM_INFO}" + fi + else + cpuCore="1" + fi + + if [ "$cpuCore" -gt "2" ];then + cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'` + else + cpuCore="1" + fi + # ----- cpu end ------ + + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi + + # https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + fi + + if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then + cd ${mariadbDir} && tar -zxvf ${mariadbDir}/mariadb-${MY_VER}.tar.gz + fi + + INSTALL_CMD=cmake + # check cmake version + CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'` + if [ "$CMAKE_VERSION" -eq "2" ];then + mkdir -p /var/log/mariadb + touch /var/log/mariadb/mariadb.log + INSTALL_CMD=cmake3 + fi + + if [ ! -d $serverPath/mariadb ];then + cd ${mariadbDir}/mariadb-${MY_VER} && ${INSTALL_CMD} \ + -DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \ + -DMYSQL_DATADIR=$serverPath/mariadb/data/ \ + -DMYSQL_USER=mysql \ + -DMYSQL_UNIX_ADDR=$serverPath/mariadb/mysql.sock \ + -DWITH_MYISAM_STORAGE_ENGINE=1 \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_MEMORY_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DEXTRA_CHARSETS=all \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DCMAKE_C_COMPILER=/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++ + make -j${cpuCore} && make install && make clean + + if [ -d $serverPath/mariadb ];then + echo '10.11' > $serverPath/mariadb/version.pl + echo '安装完成' + else + echo '安装失败' + echo 'install fail'>&2 + exit 1 + fi + fi + + if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then + rm -rf ${mariadbDir}/mariadb-${MY_VER} + fi + +} + +Uninstall_app() +{ + rm -rf $serverPath/mariadb + echo '卸载完成' > $install_tmp +} + +action=$1 +if [ "${1}" == 'install' ];then + Install_app +else + Uninstall_app +fi diff --git a/plugins/memcached/install.sh b/plugins/memcached/install.sh index af0ea57b4..afbce9397 100755 --- a/plugins/memcached/install.sh +++ b/plugins/memcached/install.sh @@ -1,6 +1,5 @@ #!/bin/bash - -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` @@ -9,9 +8,11 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") install_tmp=${rootPath}/tmp/mw_install.pl - +sys_os=`uname` VERSION=1.6.22 +echo $sys_os + Install_mem(){ mkdir -p $serverPath/source # mkdir -p $serverPath/memcached @@ -23,9 +24,18 @@ Install_mem(){ cd $serverPath/source && tar -zxvf memcached.tar.gz - + OPTIONS='' + if [ ${sys_os} == "Darwin" ]; then + LIB_DEPEND_DIR=`brew info libevent | grep /opt/homebrew/Cellar/libevent | cut -d \ -f 1 | awk 'END {print}'` + OPTIONS="${OPTIONS} --with-libevent=${LIB_DEPEND_DIR}" + fi + echo "./configure --prefix=${serverPath}/memcached && make && make install" - cd $serverPath/source/memcached-${VERSION} && ./configure --prefix=$serverPath/memcached && make && make install + cd $serverPath/source/memcached-${VERSION} + ./configure --prefix=$serverPath/memcached \ + $OPTIONS + + make && make install if [ -d $serverPath/memcached ];then echo '1.6' > $serverPath/memcached/version.pl diff --git a/plugins/mongodb/install.sh b/plugins/mongodb/install.sh index 72a4b1601..c43af23d5 100755 --- a/plugins/mongodb/install.sh +++ b/plugins/mongodb/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # https://www.mongodb.com/try/download/community @@ -70,7 +70,7 @@ Install_app() if [ "$?" == "0" ];then mkdir -p $serverPath/mongodb echo "${VERSION}" > $serverPath/mongodb/version.pl - echo '安装完成' > $install_tmp + echo 'mongodb安装完成' #初始化 cd ${rootPath} && python3 ${rootPath}/plugins/mongodb/index.py start @@ -92,7 +92,7 @@ Uninstall_app() systemctl daemon-reload fi - echo "Uninstall_mongodb" > $install_tmp + echo 'mongodb卸载完成' } action=$1 diff --git a/plugins/mongodb/versions/4.4/centos.sh b/plugins/mongodb/versions/4.4/centos.sh index 8a21a5f50..d14e129d4 100644 --- a/plugins/mongodb/versions/4.4/centos.sh +++ b/plugins/mongodb/versions/4.4/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/4.4/debian.sh b/plugins/mongodb/versions/4.4/debian.sh index c152ca1c8..a863b5f23 100644 --- a/plugins/mongodb/versions/4.4/debian.sh +++ b/plugins/mongodb/versions/4.4/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/4.4/macos.sh b/plugins/mongodb/versions/4.4/macos.sh index 06d419c65..38fcefb6b 100644 --- a/plugins/mongodb/versions/4.4/macos.sh +++ b/plugins/mongodb/versions/4.4/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/4.4/opensuse.sh b/plugins/mongodb/versions/4.4/opensuse.sh index fdca6413f..56199ee12 100644 --- a/plugins/mongodb/versions/4.4/opensuse.sh +++ b/plugins/mongodb/versions/4.4/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/4.4/rhel.sh b/plugins/mongodb/versions/4.4/rhel.sh index c7366d83a..bb2a59468 100644 --- a/plugins/mongodb/versions/4.4/rhel.sh +++ b/plugins/mongodb/versions/4.4/rhel.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/4.4/ubuntu.sh b/plugins/mongodb/versions/4.4/ubuntu.sh index b799225ab..e1c986869 100644 --- a/plugins/mongodb/versions/4.4/ubuntu.sh +++ b/plugins/mongodb/versions/4.4/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/5.0/centos.sh b/plugins/mongodb/versions/5.0/centos.sh index 7ac9fe386..b8b94654b 100644 --- a/plugins/mongodb/versions/5.0/centos.sh +++ b/plugins/mongodb/versions/5.0/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/5.0/debian.sh b/plugins/mongodb/versions/5.0/debian.sh index dda708022..8ed4e968c 100644 --- a/plugins/mongodb/versions/5.0/debian.sh +++ b/plugins/mongodb/versions/5.0/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/5.0/macos.sh b/plugins/mongodb/versions/5.0/macos.sh index ec751bd53..dc41a9517 100644 --- a/plugins/mongodb/versions/5.0/macos.sh +++ b/plugins/mongodb/versions/5.0/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/5.0/opensuse.sh b/plugins/mongodb/versions/5.0/opensuse.sh index a15a07f2b..130f991c9 100644 --- a/plugins/mongodb/versions/5.0/opensuse.sh +++ b/plugins/mongodb/versions/5.0/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/5.0/ubuntu.sh b/plugins/mongodb/versions/5.0/ubuntu.sh index 95c7aa426..c174790f3 100644 --- a/plugins/mongodb/versions/5.0/ubuntu.sh +++ b/plugins/mongodb/versions/5.0/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/6.0/centos.sh b/plugins/mongodb/versions/6.0/centos.sh index 3e76956f4..fea79997f 100644 --- a/plugins/mongodb/versions/6.0/centos.sh +++ b/plugins/mongodb/versions/6.0/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/6.0/debian.sh b/plugins/mongodb/versions/6.0/debian.sh index 63f8525ea..0831e6111 100644 --- a/plugins/mongodb/versions/6.0/debian.sh +++ b/plugins/mongodb/versions/6.0/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/6.0/macos.sh b/plugins/mongodb/versions/6.0/macos.sh index d6292e01c..163ac305f 100644 --- a/plugins/mongodb/versions/6.0/macos.sh +++ b/plugins/mongodb/versions/6.0/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/6.0/opensuse.sh b/plugins/mongodb/versions/6.0/opensuse.sh index 71323adac..47c12dee8 100644 --- a/plugins/mongodb/versions/6.0/opensuse.sh +++ b/plugins/mongodb/versions/6.0/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/6.0/ubuntu.sh b/plugins/mongodb/versions/6.0/ubuntu.sh index 0273e1816..9cf53b3e4 100644 --- a/plugins/mongodb/versions/6.0/ubuntu.sh +++ b/plugins/mongodb/versions/6.0/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/7.0/centos.sh b/plugins/mongodb/versions/7.0/centos.sh index 7475afac2..df224d9cb 100644 --- a/plugins/mongodb/versions/7.0/centos.sh +++ b/plugins/mongodb/versions/7.0/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/7.0/debian.sh b/plugins/mongodb/versions/7.0/debian.sh index 04db5b09a..32a41e735 100644 --- a/plugins/mongodb/versions/7.0/debian.sh +++ b/plugins/mongodb/versions/7.0/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/7.0/macos.sh b/plugins/mongodb/versions/7.0/macos.sh index 1cbd6bedd..632399216 100644 --- a/plugins/mongodb/versions/7.0/macos.sh +++ b/plugins/mongodb/versions/7.0/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/7.0/opensuse.sh b/plugins/mongodb/versions/7.0/opensuse.sh index 4e88178f2..5f2b02f21 100644 --- a/plugins/mongodb/versions/7.0/opensuse.sh +++ b/plugins/mongodb/versions/7.0/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mongodb/versions/7.0/ubuntu.sh b/plugins/mongodb/versions/7.0/ubuntu.sh index 9de1fac7e..908dfb565 100644 --- a/plugins/mongodb/versions/7.0/ubuntu.sh +++ b/plugins/mongodb/versions/7.0/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/mysql/install.sh b/plugins/mysql/install.sh index 0911b73a1..1b747fd02 100755 --- a/plugins/mysql/install.sh +++ b/plugins/mysql/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # 手动主从设置 diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh index 6e3213712..c36dff80c 100755 --- a/plugins/mysql/versions/5.5/install.sh +++ b/plugins/mysql/versions/5.5/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -98,10 +98,10 @@ Install_mysql() if [ -d $serverPath/mysql ];then rm -rf ${mysqlDir}/mysql-${VERSION} echo '5.5' > $serverPath/mysql/version.pl - echo '安装完成' > $install_tmp + echo "${VERSION}安装完成" else # rm -rf ${mysqlDir}/mysql-5.5.62 - echo '安装失败' > $install_tmp + echo "${VERSION}安装失败" echo 'install fail'>&2 exit 1 fi diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh index 23abd5251..a1c4c8bc1 100755 --- a/plugins/mysql/versions/5.6/install.sh +++ b/plugins/mysql/versions/5.6/install.sh @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- #!/bin/bash - -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.6.html @@ -107,10 +106,10 @@ Install_mysql() if [ -d $serverPath/mysql ];then rm -rf ${mysqlDir}/mysql-${VERSION} echo '5.6' > $serverPath/mysql/version.pl - echo '安装完成' > $install_tmp + echo "${VERSION}安装完成" else # rm -rf ${mysqlDir}/mysql-5.6.50 - echo '安装失败' > $install_tmp + echo "${VERSION}安装失败" echo 'install fail'>&2 exit 1 fi diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh index 93c67b425..01c374d53 100755 --- a/plugins/mysql/versions/5.7/install.sh +++ b/plugins/mysql/versions/5.7/install.sh @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- #!/bin/bash - -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.7.html @@ -120,10 +119,10 @@ Install_mysql() if [ -d $serverPath/mysql ];then rm -rf ${mysqlDir}/mysql-${VERSION} echo '5.7' > $serverPath/mysql/version.pl - echo '安装完成' > $install_tmp + echo "${VERSION}安装完成" else # rm -rf ${mysqlDir}/mysql-${VERSION} - echo '安装失败' > $install_tmp + echo "${VERSION}安装失败" echo 'install fail'>&2 exit 1 fi diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh index da67efa54..d03d84302 100755 --- a/plugins/mysql/versions/8.0/install.sh +++ b/plugins/mysql/versions/8.0/install.sh @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- #!/bin/bash - -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #https://dev.mysql.com/downloads/mysql/5.7.html @@ -213,10 +212,10 @@ Install_mysql() if [ -d $serverPath/mysql ];then rm -rf ${mysqlDir}/mysql-${VERSION} echo '8.0' > $serverPath/mysql/version.pl - echo '安装完成' > $install_tmp + echo "${VERSION}安装完成" else # rm -rf ${mysqlDir}/mysql-${VERSION} - echo '安装失败' > $install_tmp + echo "${VERSION}安装失败" echo 'install fail'>&2 exit 1 fi diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py index ab5de6c72..536930912 100755 --- a/plugins/openresty/index.py +++ b/plugins/openresty/index.py @@ -87,9 +87,9 @@ def getOs(): data['os'] = mw.getOs() ng_exe_bin = getServerDir() + "/nginx/sbin/nginx" - if mw.isAppleSystem(): - data['auth'] = True - return mw.getJson(data) + # if mw.isAppleSystem(): + # data['auth'] = True + # return mw.getJson(data) if checkAuthEq(ng_exe_bin, 'root'): data['auth'] = True @@ -137,9 +137,9 @@ def confReplace(): current_os = mw.getOs() if current_os == 'darwin': # macosx do - user = mw.execShell( - "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() - # user = 'root' + # user = mw.execShell( + # "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() + user = 'midoks' user_group = 'staff' content = content.replace('{$EVENT_MODEL}', 'kqueue') elif current_os.startswith('freebsd'): @@ -187,18 +187,6 @@ def confReplace(): if not os.path.exists(static_conf): mw.writeFile(static_conf, 'set $PHP_ENV 0;') - # give nginx root permission - ng_exe_bin = getServerDir() + "/nginx/sbin/nginx" - if not checkAuthEq(ng_exe_bin, 'root'): - args = getArgs() - sudoPwd = args['pwd'] - cmd_own = 'chown -R ' + 'root:' + user_group + ' ' + ng_exe_bin - os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_own)) - cmd_mod = 'chmod 755 ' + ng_exe_bin - os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_mod)) - cmd_s = 'chmod u+s ' + ng_exe_bin - os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_s)) - # vhost vhost_dir = mw.getServerDir() + '/web_conf/nginx/vhost' vhost_tpl_dir = getPluginDir() + '/conf/vhost' @@ -237,6 +225,28 @@ def initDreplace(): # config replace confReplace() + # give nginx root permission + ng_exe_bin = getServerDir() + "/nginx/sbin/nginx" + if not checkAuthEq(ng_exe_bin, 'root'): + user = 'www' + user_group = 'www' + current_os = mw.getOs() + if current_os == 'darwin': + user = 'root' + user_group = 'staff' + args = getArgs() + if not 'pwd' in args: + print("权限不足,需要认证启动!") + exit(0) + + sudoPwd = args['pwd'] + cmd_own = 'chown -R ' + user+':' + user_group + ' ' + ng_exe_bin + mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_own)) + cmd_mod = 'chmod 755 ' + ng_exe_bin + mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_mod)) + cmd_s = 'chmod u+s ' + ng_exe_bin + mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_s)) + # systemd # /usr/lib/systemd/system systemDir = mw.systemdCfgDir() diff --git a/plugins/openresty/info.json b/plugins/openresty/info.json index 88c959b98..e49eaf6f3 100755 --- a/plugins/openresty/info.json +++ b/plugins/openresty/info.json @@ -12,6 +12,6 @@ "home":"http://openresty.org", "date":"2017-11-24", "pid": "1", - "versions": ["1.17.8.2","1.19.3.1","1.21.4.2"], - "updates": ["1.17.8.2","1.19.3.1","1.21.4.2"] + "versions": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3"], + "updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3"] } \ No newline at end of file diff --git a/plugins/openresty/init.d/nginx.tpl b/plugins/openresty/init.d/nginx.tpl index ebc8555a9..d773f931a 100644 --- a/plugins/openresty/init.d/nginx.tpl +++ b/plugins/openresty/init.d/nginx.tpl @@ -15,7 +15,7 @@ ### END INIT INFO -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/homebrew/bin NAME=nginx NGINX_BIN={$SERVER_PATH}/openresty/bin/openresty CONFIGFILE={$SERVER_PATH}/openresty/nginx/conf/$NAME.conf diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh index 83ea1a96d..252df3036 100755 --- a/plugins/openresty/install.sh +++ b/plugins/openresty/install.sh @@ -2,6 +2,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH +# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2 # cd /www/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2 curPath=`pwd` @@ -9,7 +10,7 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") - +sysName=`uname` action=$1 type=$2 @@ -25,6 +26,12 @@ else useradd -g www -s /bin/bash www fi +if [ "$sysName" == "Darwin" ];then + BAK='_bak' +else + BAK='' +fi + Install_openresty() { if [ -d $serverPath/openresty ];then @@ -57,7 +64,7 @@ Install_openresty() # ----- cpu end ------ mkdir -p ${openrestyDir} - echo '正在安装脚本文件...' > $install_tmp + echo '正在安装脚本文件...' # wget -O openresty-1.21.4.1.tar.gz https://openresty.org/download/openresty-1.21.4.1.tar.gz if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then @@ -79,7 +86,39 @@ Install_openresty() OPTIONS='' if [ "$VERSION" == "1.19.3.1" ]; then - OPTIONS=" ${OPTIONS} --with-ipv6 " + OPTIONS="${OPTIONS} --with-ipv6" + fi + + + opensslVersion="1.1.1p" + pcreVersion='8.38' + if [ "$sysName" == "Darwin" ];then + + if [ ! -f ${openrestyDir}/pcre-${pcreVersion}.tar.gz ];then + wget --no-check-certificate -O ${openrestyDir}/pcre-${pcreVersion}.tar.gz https://netix.dl.sourceforge.net/project/pcre/pcre/${pcreVersion}/pcre-${pcreVersion}.tar.gz + fi + + if [ ! -d ${openrestyDir}/pcre-${pcreVersion} ];then + cd ${openrestyDir} && tar -zxvf pcre-${pcreVersion}.tar.gz + fi + OPTIONS="${OPTIONS} --with-pcre=${openrestyDir}/pcre-${pcreVersion}" + + + if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then + wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz + fi + + if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then + cd ${openrestyDir} && tar -zxvf openssl-${opensslVersion}.tar.gz + fi + OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}" + + # BREW_DIR=`which brew` + # BREW_DIR=${BREW_DIR/\/bin\/brew/} + + # brew info openssl@1.1 | grep /opt/homebrew/Cellar/openssl@1.1 | cut -d \ -f 1 | awk 'END {print}' + # OPENSSL_LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl@1.1 | cut -d \ -f 1 | awk 'END {print}'` + # OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}" fi # --with-openssl=$serverPath/source/lib/openssl-1.0.2q @@ -113,9 +152,17 @@ Install_openresty() #初始化 cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py start cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py initd_install - rm -rf $openrestyDir + rm -rf $openrestyDir/openresty-${VERSION} + fi + + if [ -d ${openrestyDir}/pcre-${pcreVersion} ];then + rm -rf ${openrestyDir}/pcre-${pcreVersion} + fi + + if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then + rm -rf ${openrestyDir}/openssl-${opensslVersion} fi - echo '安装完成' > $install_tmp + echo '安装完成' } Uninstall_openresty() @@ -133,7 +180,7 @@ Uninstall_openresty() fi rm -rf $serverPath/openresty - echo '卸载完成' > $install_tmp + echo '卸载完成' } action=$1 diff --git a/plugins/php/install.sh b/plugins/php/install.sh index 1a42db670..ad30e3488 100755 --- a/plugins/php/install.sh +++ b/plugins/php/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/freetype_new.sh b/plugins/php/lib/freetype_new.sh index 9ef1f10f3..f68ab52b3 100644 --- a/plugins/php/lib/freetype_new.sh +++ b/plugins/php/lib/freetype_new.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/freetype_old.sh b/plugins/php/lib/freetype_old.sh index d19b5f34c..e9c559ce2 100644 --- a/plugins/php/lib/freetype_old.sh +++ b/plugins/php/lib/freetype_old.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/icu.sh b/plugins/php/lib/icu.sh index b6cd37252..53291fb41 100644 --- a/plugins/php/lib/icu.sh +++ b/plugins/php/lib/icu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/libiconv.sh b/plugins/php/lib/libiconv.sh index 9c127800a..7f2c870f9 100644 --- a/plugins/php/lib/libiconv.sh +++ b/plugins/php/lib/libiconv.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/libmcrypt.sh b/plugins/php/lib/libmcrypt.sh index cefef657d..57b9e6a48 100644 --- a/plugins/php/lib/libmcrypt.sh +++ b/plugins/php/lib/libmcrypt.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/libmemcached.sh b/plugins/php/lib/libmemcached.sh index 5cb5c48cd..8352be814 100644 --- a/plugins/php/lib/libmemcached.sh +++ b/plugins/php/lib/libmemcached.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/libsodium.sh b/plugins/php/lib/libsodium.sh index 3178a4d50..6c2b389f2 100644 --- a/plugins/php/lib/libsodium.sh +++ b/plugins/php/lib/libsodium.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/libzip.sh b/plugins/php/lib/libzip.sh index 12933ec78..b34715825 100644 --- a/plugins/php/lib/libzip.sh +++ b/plugins/php/lib/libzip.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` @@ -13,12 +13,14 @@ rootPath=$(dirname "$rootPath") SERVER_ROOT=$rootPath/lib SOURCE_ROOT=$rootPath/source/lib +mkdir -p $SOURCE_ROOT HTTP_PREFIX="https://" cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then HTTP_PREFIX="https://ghproxy.com/" fi +# HTTP_PREFIX="https://" if [ ! -d ${SERVER_ROOT}/libzip ];then @@ -27,7 +29,10 @@ if [ ! -d ${SERVER_ROOT}/libzip ];then wget --no-check-certificate -O libzip-1.3.2.tar.gz ${HTTP_PREFIX}github.com/midoks/mdserver-web/releases/download/init/libzip-1.3.2.tar.gz -T 20 fi - tar -zxvf libzip-1.3.2.tar.gz + if [ ! -d ${SOURCE_ROOT}/libzip-1.3.2 ];then + cd $SOURCE_ROOT && tar -zxvf libzip-1.3.2.tar.gz + fi + cd ${SOURCE_ROOT}/libzip-1.3.2 ./configure --prefix=${SERVER_ROOT}/libzip && make && make install diff --git a/plugins/php/lib/oniguruma.sh b/plugins/php/lib/oniguruma.sh index 9ebcd9271..55ea5d9b2 100644 --- a/plugins/php/lib/oniguruma.sh +++ b/plugins/php/lib/oniguruma.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/openssl.sh b/plugins/php/lib/openssl.sh index a6c1bc434..7cd4a89c5 100644 --- a/plugins/php/lib/openssl.sh +++ b/plugins/php/lib/openssl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/openssl_10.sh b/plugins/php/lib/openssl_10.sh index 75fcc90c7..93ab59710 100644 --- a/plugins/php/lib/openssl_10.sh +++ b/plugins/php/lib/openssl_10.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/openssl_11.sh b/plugins/php/lib/openssl_11.sh index ee2a79098..4124b356a 100644 --- a/plugins/php/lib/openssl_11.sh +++ b/plugins/php/lib/openssl_11.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/lib/zlib.sh b/plugins/php/lib/zlib.sh index 809517242..a87e43f0a 100644 --- a/plugins/php/lib/zlib.sh +++ b/plugins/php/lib/zlib.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` @@ -13,21 +13,27 @@ rootPath=$(dirname "$rootPath") SERVER_ROOT=$rootPath/lib SOURCE_ROOT=$rootPath/source/lib +mkdir -p $SOURCE_ROOT + HTTP_PREFIX="https://" cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then HTTP_PREFIX="https://ghproxy.com/" fi +# HTTP_PREFIX="https://" if [ ! -d ${SERVER_ROOT}/zlib ];then cd $SOURCE_ROOT if [ ! -f ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ];then - wget --no-check-certificate -O zlib-1.2.11.tar.gz ${HTTP_PREFIX}github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20 + echo "wget --no-check-certificate -O ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ${HTTP_PREFIX}github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20" + wget --no-check-certificate -O ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ${HTTP_PREFIX}github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20 fi - tar -zxvf zlib-1.2.11.tar.gz - cd zlib-1.2.11 + if [ ! -d ${SOURCE_ROOT}/zlib-1.2.11 ];then + cd $SOURCE_ROOT && tar -zxvf zlib-1.2.11.tar.gz + fi + cd ${SOURCE_ROOT}/zlib-1.2.11 ./configure --prefix=${SERVER_ROOT}/zlib && make && make install diff --git a/plugins/php/versions/52/eaccelerator.sh b/plugins/php/versions/52/eaccelerator.sh index bd50e9d95..edeb19619 100755 --- a/plugins/php/versions/52/eaccelerator.sh +++ b/plugins/php/versions/52/eaccelerator.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # php 5.2.17 + eaccelerator 0.9.5.3 diff --git a/plugins/php/versions/52/gd.sh b/plugins/php/versions/52/gd.sh index ab4e397ab..109e5806e 100755 --- a/plugins/php/versions/52/gd.sh +++ b/plugins/php/versions/52/gd.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index f93d8b819..0027b7406 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/52/intl.sh b/plugins/php/versions/52/intl.sh index d75427f24..803fbeba9 100755 --- a/plugins/php/versions/52/intl.sh +++ b/plugins/php/versions/52/intl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/52/memcache.sh b/plugins/php/versions/52/memcache.sh index d5f77addd..f8cd093be 100755 --- a/plugins/php/versions/52/memcache.sh +++ b/plugins/php/versions/52/memcache.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/52/zendoptimizer.sh b/plugins/php/versions/52/zendoptimizer.sh index 338c8923f..787a3e498 100755 --- a/plugins/php/versions/52/zendoptimizer.sh +++ b/plugins/php/versions/52/zendoptimizer.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/53/apc.sh b/plugins/php/versions/53/apc.sh index c00a2c330..a34967930 100755 --- a/plugins/php/versions/53/apc.sh +++ b/plugins/php/versions/53/apc.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/53/eaccelerator.sh b/plugins/php/versions/53/eaccelerator.sh index 30369ba69..027e70147 100755 --- a/plugins/php/versions/53/eaccelerator.sh +++ b/plugins/php/versions/53/eaccelerator.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # php 5.2.17 + eaccelerator 0.9.5.3 diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 0a8dc776d..c0da43361 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/53/intl.sh b/plugins/php/versions/53/intl.sh index 51aaeec64..3b8c2f83d 100755 --- a/plugins/php/versions/53/intl.sh +++ b/plugins/php/versions/53/intl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/53/opcache.sh b/plugins/php/versions/53/opcache.sh index eb42e6b99..783c64d5f 100755 --- a/plugins/php/versions/53/opcache.sh +++ b/plugins/php/versions/53/opcache.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/53/zendguardloader.sh b/plugins/php/versions/53/zendguardloader.sh index 8670e1296..77baa7a89 100755 --- a/plugins/php/versions/53/zendguardloader.sh +++ b/plugins/php/versions/53/zendguardloader.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/54/apc.sh b/plugins/php/versions/54/apc.sh index 810319253..5dd169c07 100755 --- a/plugins/php/versions/54/apc.sh +++ b/plugins/php/versions/54/apc.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index f5c2fac5a..a9c2c30f3 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/54/opcache.sh b/plugins/php/versions/54/opcache.sh index 22a65368f..bb46a63df 100755 --- a/plugins/php/versions/54/opcache.sh +++ b/plugins/php/versions/54/opcache.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/54/zendguardloader.sh b/plugins/php/versions/54/zendguardloader.sh index dff1474dd..197a5cbb6 100755 --- a/plugins/php/versions/54/zendguardloader.sh +++ b/plugins/php/versions/54/zendguardloader.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 7ee4b398a..1d75db289 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 999fa5acb..5641b2ec9 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # cd /www/server/mdserver-web/plugins/php && /bin/bash install.sh install 56 diff --git a/plugins/php/versions/56/zendguardloader.sh b/plugins/php/versions/56/zendguardloader.sh index 431b5ef75..89b87ae74 100755 --- a/plugins/php/versions/56/zendguardloader.sh +++ b/plugins/php/versions/56/zendguardloader.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index a290c036f..d614dd20b 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index 6889b8c25..d1384f36c 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/71/mcrypt.sh b/plugins/php/versions/71/mcrypt.sh index c29827b76..0ad94c70d 100755 --- a/plugins/php/versions/71/mcrypt.sh +++ b/plugins/php/versions/71/mcrypt.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index cddb39673..852f28cc5 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index c031149e1..c58105f3a 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 88fa8042b..5414929b1 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 18b3b9bd8..cdf7df718 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 2adcaacdd..6b9f12759 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index cab5e055c..19f4ae6f6 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/all_test.sh b/plugins/php/versions/all_test.sh index 82b1f589d..6e1aa6a72 100644 --- a/plugins/php/versions/all_test.sh +++ b/plugins/php/versions/all_test.sh @@ -1,5 +1,5 @@ #! /bin/sh -export PATH=$PATH:/opt/local/bin:/opt/local/sbin:/opt/local/share/man:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin +export PATH=$PATH:/opt/local/bin:/opt/local/sbin:/opt/local/share/man:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/opt/homebrew/bin DIR=$(cd "$(dirname "$0")"; pwd) ROOT_DIR=$(cd "$(dirname "$0")"; pwd) diff --git a/plugins/php/versions/common.sh b/plugins/php/versions/common.sh index e2812378e..3d8b73a3a 100644 --- a/plugins/php/versions/common.sh +++ b/plugins/php/versions/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/apcu.sh b/plugins/php/versions/common/apcu.sh index f8bb2a704..9d3952097 100755 --- a/plugins/php/versions/common/apcu.sh +++ b/plugins/php/versions/common/apcu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/bcmath.sh b/plugins/php/versions/common/bcmath.sh index a9bedc04c..61ca4f384 100755 --- a/plugins/php/versions/common/bcmath.sh +++ b/plugins/php/versions/common/bcmath.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/exif.sh b/plugins/php/versions/common/exif.sh index 85727d1a6..f2a7112f2 100755 --- a/plugins/php/versions/common/exif.sh +++ b/plugins/php/versions/common/exif.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 7ad24dc73..38bb379a6 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/gd.sh b/plugins/php/versions/common/gd.sh index 0a0ea467b..2d20d1db9 100755 --- a/plugins/php/versions/common/gd.sh +++ b/plugins/php/versions/common/gd.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index cf63f6f4e..f57e36bae 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/gettext.sh b/plugins/php/versions/common/gettext.sh index 2b3e04745..169bd67f5 100755 --- a/plugins/php/versions/common/gettext.sh +++ b/plugins/php/versions/common/gettext.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/gmp.sh b/plugins/php/versions/common/gmp.sh index 7c3c537c5..4fab8b503 100755 --- a/plugins/php/versions/common/gmp.sh +++ b/plugins/php/versions/common/gmp.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/iconv.sh b/plugins/php/versions/common/iconv.sh index 89972bf96..e0b65b6fa 100755 --- a/plugins/php/versions/common/iconv.sh +++ b/plugins/php/versions/common/iconv.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/igbinary.sh b/plugins/php/versions/common/igbinary.sh index fe5642151..42e34ab16 100755 --- a/plugins/php/versions/common/igbinary.sh +++ b/plugins/php/versions/common/igbinary.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh index d1338b395..09eff0127 100755 --- a/plugins/php/versions/common/imagemagick.sh +++ b/plugins/php/versions/common/imagemagick.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/intl.sh b/plugins/php/versions/common/intl.sh index 609808a5b..7f1ca6d21 100755 --- a/plugins/php/versions/common/intl.sh +++ b/plugins/php/versions/common/intl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/ioncube.sh b/plugins/php/versions/common/ioncube.sh index 76291cf79..beb9288f4 100755 --- a/plugins/php/versions/common/ioncube.sh +++ b/plugins/php/versions/common/ioncube.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/mcrypt.sh b/plugins/php/versions/common/mcrypt.sh index 81530b8db..32d8a9042 100755 --- a/plugins/php/versions/common/mcrypt.sh +++ b/plugins/php/versions/common/mcrypt.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/memcache.sh b/plugins/php/versions/common/memcache.sh index 61809188d..269c0bb96 100755 --- a/plugins/php/versions/common/memcache.sh +++ b/plugins/php/versions/common/memcache.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/memcached.sh b/plugins/php/versions/common/memcached.sh index d1951c079..1eeda2e51 100755 --- a/plugins/php/versions/common/memcached.sh +++ b/plugins/php/versions/common/memcached.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/mongo.sh b/plugins/php/versions/common/mongo.sh index 8b9f4ae68..ad5356190 100755 --- a/plugins/php/versions/common/mongo.sh +++ b/plugins/php/versions/common/mongo.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/mongodb.sh b/plugins/php/versions/common/mongodb.sh index 6c3d3f844..5249b7820 100755 --- a/plugins/php/versions/common/mongodb.sh +++ b/plugins/php/versions/common/mongodb.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/opcache.sh b/plugins/php/versions/common/opcache.sh index ff85f2ebe..0bb29855b 100755 --- a/plugins/php/versions/common/opcache.sh +++ b/plugins/php/versions/common/opcache.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh index 5fd529ecf..f0e6424a4 100755 --- a/plugins/php/versions/common/openssl.sh +++ b/plugins/php/versions/common/openssl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/pcntl.sh b/plugins/php/versions/common/pcntl.sh index b6eec1114..158ca9d7f 100755 --- a/plugins/php/versions/common/pcntl.sh +++ b/plugins/php/versions/common/pcntl.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/phalcon.sh b/plugins/php/versions/common/phalcon.sh index 69f09f025..81084d72b 100755 --- a/plugins/php/versions/common/phalcon.sh +++ b/plugins/php/versions/common/phalcon.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/redis.sh b/plugins/php/versions/common/redis.sh index 331504570..14df2f3fd 100755 --- a/plugins/php/versions/common/redis.sh +++ b/plugins/php/versions/common/redis.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/seaslog.sh b/plugins/php/versions/common/seaslog.sh index 7dbc6e7fe..d7a0c910e 100755 --- a/plugins/php/versions/common/seaslog.sh +++ b/plugins/php/versions/common/seaslog.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/sg11.sh b/plugins/php/versions/common/sg11.sh index b67a6cf66..363aefa29 100644 --- a/plugins/php/versions/common/sg11.sh +++ b/plugins/php/versions/common/sg11.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/sodium.sh b/plugins/php/versions/common/sodium.sh index 714b18a7f..1ed75bb7e 100755 --- a/plugins/php/versions/common/sodium.sh +++ b/plugins/php/versions/common/sodium.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/solr.sh b/plugins/php/versions/common/solr.sh index 6ed0c2afd..bdbe6275e 100755 --- a/plugins/php/versions/common/solr.sh +++ b/plugins/php/versions/common/solr.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/swoole.sh b/plugins/php/versions/common/swoole.sh index dad48b7a8..83422f5df 100755 --- a/plugins/php/versions/common/swoole.sh +++ b/plugins/php/versions/common/swoole.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/xdebug.sh b/plugins/php/versions/common/xdebug.sh index a2a765aaf..ba5a9d9c5 100755 --- a/plugins/php/versions/common/xdebug.sh +++ b/plugins/php/versions/common/xdebug.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/xhprof.sh b/plugins/php/versions/common/xhprof.sh index 642c03c62..f73ff87a2 100755 --- a/plugins/php/versions/common/xhprof.sh +++ b/plugins/php/versions/common/xhprof.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/yac.sh b/plugins/php/versions/common/yac.sh index 2b3ee01bd..c90bc2c8e 100755 --- a/plugins/php/versions/common/yac.sh +++ b/plugins/php/versions/common/yac.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/yaf.sh b/plugins/php/versions/common/yaf.sh index 8b9ead6e6..be05e77d6 100755 --- a/plugins/php/versions/common/yaf.sh +++ b/plugins/php/versions/common/yaf.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/yaml.sh b/plugins/php/versions/common/yaml.sh index cdd65e235..62ecb6157 100755 --- a/plugins/php/versions/common/yaml.sh +++ b/plugins/php/versions/common/yaml.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/yar.sh b/plugins/php/versions/common/yar.sh index 22b010a89..674cce405 100755 --- a/plugins/php/versions/common/yar.sh +++ b/plugins/php/versions/common/yar.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/zip.sh b/plugins/php/versions/common/zip.sh index 0798e4de0..226d2f1dc 100755 --- a/plugins/php/versions/common/zip.sh +++ b/plugins/php/versions/common/zip.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/common/zlib.sh b/plugins/php/versions/common/zlib.sh index 5d409d0d9..67b648d66 100755 --- a/plugins/php/versions/common/zlib.sh +++ b/plugins/php/versions/common/zlib.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/php/versions/lib.sh b/plugins/php/versions/lib.sh index df6aa2936..54dbdd87f 100644 --- a/plugins/php/versions/lib.sh +++ b/plugins/php/versions/lib.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/plugins/redis/install.sh b/plugins/redis/install.sh index 7cd6e4749..09daaa458 100755 --- a/plugins/redis/install.sh +++ b/plugins/redis/install.sh @@ -8,8 +8,10 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") -install_tmp=${rootPath}/tmp/mw_install.pl +# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/redis && bash install.sh install 7.2.2 + +install_tmp=${rootPath}/tmp/mw_install.pl VERSION=$2 Install_App() @@ -23,8 +25,7 @@ Install_App() cd $serverPath/source && tar -zxvf redis-${VERSION}.tar.gz - mkdir -p $serverPath/redis - mkdir -p $serverPath/redis/data + CMD_MAKE=`which gmake` if [ "$?" == "0" ];then @@ -32,16 +33,22 @@ Install_App() else cd redis-${VERSION} && make PREFIX=$serverPath/redis install fi - sed '/^ *#/d' redis.conf > $serverPath/redis/redis.conf if [ -d $serverPath/redis ];then - echo "${VERSION}" > $serverPath/redis/version.pl - echo '安装完成' > $install_tmp + mkdir -p $serverPath/redis/data + sed '/^ *#/d' redis.conf > $serverPath/redis/redis.conf + echo "${VERSION}" > $serverPath/redis/version.pl + echo '安装完成' cd ${rootPath} && python3 ${rootPath}/plugins/redis/index.py start cd ${rootPath} && python3 ${rootPath}/plugins/redis/index.py initd_install + + else + echo '安装失败!' + fi + if [ -d $serverPath/source/redis-${VERSION} ];then rm -rf $serverPath/source/redis-${VERSION} fi } diff --git a/plugins/sphinx/install.sh b/plugins/sphinx/install.sh index 338a82404..187da6266 100755 --- a/plugins/sphinx/install.sh +++ b/plugins/sphinx/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH curPath=`pwd` diff --git a/scripts/getos.sh b/scripts/getos.sh index e9802f1ba..b6afbb807 100755 --- a/scripts/getos.sh +++ b/scripts/getos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #获取信息和版本 diff --git a/scripts/install.sh b/scripts/install.sh index 6955086e7..279e3b53a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index 88770634d..8c2a9f440 100755 --- a/scripts/install/alma.sh +++ b/scripts/install/alma.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=C.UTF-8 diff --git a/scripts/install/amazon.sh b/scripts/install/amazon.sh index f21bb015a..29d38617c 100755 --- a/scripts/install/amazon.sh +++ b/scripts/install/amazon.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/arch.sh b/scripts/install/arch.sh index c287a72e6..c954ed850 100644 --- a/scripts/install/arch.sh +++ b/scripts/install/arch.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 48fd1cec3..eeb453b79 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index a5fffa898..0ea60280a 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/install/euler.sh b/scripts/install/euler.sh index 333c33590..5bbe5f8ba 100755 --- a/scripts/install/euler.sh +++ b/scripts/install/euler.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 64f0af20c..c67b60e49 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/freebsd.sh b/scripts/install/freebsd.sh index db902dc7a..8af05444b 100644 --- a/scripts/install/freebsd.sh +++ b/scripts/install/freebsd.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/macos.sh b/scripts/install/macos.sh index 7913f35d0..d694d48d6 100755 --- a/scripts/install/macos.sh +++ b/scripts/install/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 @@ -22,6 +22,7 @@ if [ "$?" != "0" ];then brew install mysql fi +brew install md5sum libevent pidof bison brew install libzip bzip2 gcc openssl re2c cmake diff --git a/scripts/install/opensuse.sh b/scripts/install/opensuse.sh index 40cadc1a9..7576c8269 100644 --- a/scripts/install/opensuse.sh +++ b/scripts/install/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index 998cc8720..7b885f8fe 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 SYS_ARCH=`arch` diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index 510033972..d36bfb8f5 100644 --- a/scripts/install/rocky.sh +++ b/scripts/install/rocky.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 1a9fe9759..bd884b7e5 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/install/unknow.sh b/scripts/install/unknow.sh index 496ad0973..5cea93ad0 100644 --- a/scripts/install/unknow.sh +++ b/scripts/install/unknow.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index b0ce3f915..f8646e03a 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` diff --git a/scripts/lib.sh b/scripts/lib.sh index f37ee5da4..fbd36fe50 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } diff --git a/scripts/pick.sh b/scripts/pick.sh index 5de99904e..75746c354 100755 --- a/scripts/pick.sh +++ b/scripts/pick.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin curPath=`pwd` rootPath=$(dirname "$curPath") diff --git a/scripts/plugin_compress.sh b/scripts/plugin_compress.sh index d6bef952f..58dd98fe0 100755 --- a/scripts/plugin_compress.sh +++ b/scripts/plugin_compress.sh @@ -3,7 +3,7 @@ ### ### 插件压缩 ### -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` diff --git a/scripts/quick/app.sh b/scripts/quick/app.sh index 9dae2e04b..51c0a39f0 100755 --- a/scripts/quick/app.sh +++ b/scripts/quick/app.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH if [ ! -d /www/server/mdserver-web/logs ]; then diff --git a/scripts/quick/debug.sh b/scripts/quick/debug.sh index 9fae4430f..69b9ca1de 100755 --- a/scripts/quick/debug.sh +++ b/scripts/quick/debug.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH if [ ! -d /www/server/mdserver-web/logs ]; then diff --git a/scripts/rememory.sh b/scripts/rememory.sh index a971110ce..933f7eff2 100755 --- a/scripts/rememory.sh +++ b/scripts/rememory.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH #+------------------------------------ #+ 释放内存脚本 diff --git a/scripts/update.sh b/scripts/update.sh index 9a8b7be25..b5b9c598a 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` diff --git a/scripts/update/alma.sh b/scripts/update/alma.sh index 7021d5be1..3fecb6298 100755 --- a/scripts/update/alma.sh +++ b/scripts/update/alma.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=C.UTF-8 diff --git a/scripts/update/amazon.sh b/scripts/update/amazon.sh index 4a501dae5..e31d9d869 100755 --- a/scripts/update/amazon.sh +++ b/scripts/update/amazon.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/arch.sh b/scripts/update/arch.sh index acae4f97f..edec63b06 100644 --- a/scripts/update/arch.sh +++ b/scripts/update/arch.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/centos.sh b/scripts/update/centos.sh index 746c6dd79..1ea9387e1 100755 --- a/scripts/update/centos.sh +++ b/scripts/update/centos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index cc76e9367..1e454cbe4 100644 --- a/scripts/update/debian.sh +++ b/scripts/update/debian.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/update/euler.sh b/scripts/update/euler.sh index 746c6dd79..1ea9387e1 100755 --- a/scripts/update/euler.sh +++ b/scripts/update/euler.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 diff --git a/scripts/update/fedora.sh b/scripts/update/fedora.sh index 0b9c0580b..715239e0b 100644 --- a/scripts/update/fedora.sh +++ b/scripts/update/fedora.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/freebsd.sh b/scripts/update/freebsd.sh index 5597f8699..bf519f07a 100644 --- a/scripts/update/freebsd.sh +++ b/scripts/update/freebsd.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/macos.sh b/scripts/update/macos.sh index fbf382aba..c90a59b5a 100644 --- a/scripts/update/macos.sh +++ b/scripts/update/macos.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/opensuse.sh b/scripts/update/opensuse.sh index ab2951229..65bce9b2f 100644 --- a/scripts/update/opensuse.sh +++ b/scripts/update/opensuse.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/rhel.sh b/scripts/update/rhel.sh index 326fc9715..20c2f28a6 100644 --- a/scripts/update/rhel.sh +++ b/scripts/update/rhel.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 diff --git a/scripts/update/rocky.sh b/scripts/update/rocky.sh index 51f65c87f..408ae8915 100755 --- a/scripts/update/rocky.sh +++ b/scripts/update/rocky.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update/ubuntu.sh b/scripts/update/ubuntu.sh index 050984955..74da1d9d9 100644 --- a/scripts/update/ubuntu.sh +++ b/scripts/update/ubuntu.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH export LANG=en_US.UTF-8 export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/update/unknow.sh b/scripts/update/unknow.sh index fce42c80b..c9d5b5ca3 100644 --- a/scripts/update/unknow.sh +++ b/scripts/update/unknow.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH LANG=en_US.UTF-8 diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 5a40237d0..d3eb37057 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -1,5 +1,5 @@ #!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT`