[fixed] Update iconv

README.md

@@ -1,18 +1,18 @@
 [![PayPal donate button](https://img.shields.io/badge/paypal-donate-green.svg)](https://paypal.me/yeho) [![支付宝捐助按钮](https://img.shields.io/badge/%E6%94%AF%E4%BB%98%E5%AE%9D-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg)](https://static.oneinstack.com/images/alipay.png) [![微信捐助按钮](https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg)](https://static.oneinstack.com/images/weixin.png)
 
-This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP`/`LNMPA`/`LTMP`(Linux, Nginx/Tengine/OpenResty, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 7 ~ 8(including redhat), Debian 8 ~ 11, Ubuntu 16 ~ 20, Fedora 27+ of 32 and 64.
+This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP`/`LNMPA`/`LTMP`(Linux, Nginx/Tengine/OpenResty, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 7 ~ 8(including redhat), Debian 8 ~ 11, Ubuntu 16 ~ 21, Fedora 27+ of 32 and 64.
 
 Script properties:
 - Continually updated, Provide Shell Interaction and Autoinstall
 - Source compiler installation, most stable source is the latest version, and download from the official site
 - Some security optimization
 - Providing a plurality of database versions (MySQL-8.0, MySQL-5.7, MySQL-5.6, MySQL-5.5, MariaDB-10.5, MariaDB-10.4, MariaDB-10.3, MariaDB-5.5, Percona-8.0, Percona-5.7, Percona-5.6, Percona-5.5, PostgreSQL, MongoDB)
-- Providing multiple PHP versions (PHP-8.0, PHP-7.4, PHP-7.3, PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
+- Providing multiple PHP versions (PHP-8.1, PHP-8.0, PHP-7.4, PHP-7.3, PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
 - Provide Nginx, Tengine, OpenResty, Apache and ngx_lua_waf
 - Providing a plurality of Tomcat version (Tomcat-10, Tomcat-9, Tomcat-8, Tomcat-7)
 - Providing a plurality of JDK version (JDK-11.0, JDK-1.8, JDK-1.7, JDK-1.6)
 - According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,calendar,phalcon,yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
-- Installation Pureftpd, phpMyAdmin according to their needs
+- Installation Nodejs, Pureftpd, phpMyAdmin according to their needs
 - Install memcached, redis according to their needs
 - Jemalloc optimize MySQL, Nginx
 - Providing add a virtual host script, include Let's Encrypt SSL certificate

backup_setup.sh

@@ -182,27 +182,29 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
-    wget -qc https://gosspublic.alicdn.com/ossutil/1.7.3/ossutil${OS_BIT} -O /usr/local/bin/ossutil
+    wget -qc https://gosspublic.alicdn.com/ossutil/1.7.8/ossutil${OS_BIT} -O /usr/local/bin/ossutil
     chmod +x /usr/local/bin/ossutil
   fi
   while :; do echo
     echo 'Please select your backup aliyun datacenter:'
-    echo -e "\t ${CMSG}1${CEND}. cn-hangzhou-华东 1 (杭州)         ${CMSG}2${CEND}. cn-shanghai-华东 2 (上海)"
-    echo -e "\t ${CMSG}3${CEND}. cn-qingdao-华北 1 (青岛)          ${CMSG}4${CEND}. cn-beijing-华北 2 (北京)"
-    echo -e "\t ${CMSG}5${CEND}. cn-zhangjiakou-华北 3 (张家口)    ${CMSG}6${CEND}. cn-huhehaote-华北 5(呼和浩特)"
-    echo -e "\t ${CMSG}7${CEND}. cn-shenzhen-华南 1 (深圳)         ${CMSG}8${CEND}. cn-chengdu-西南 1（成都）"
-    echo -e "\t ${CMSG}9${CEND}. cn-hongkong-香港                 ${CMSG}10${CEND}. us-west-美西 1 (硅谷)"
-    echo -e "\t${CMSG}11${CEND}. us-east-美东 1 (弗吉尼亚)        ${CMSG}12${CEND}. ap-southeast-亚太东南 1 (新加坡)"
-    echo -e "\t${CMSG}13${CEND}. ap-southeast-亚太东南 2 (悉尼)   ${CMSG}14${CEND}. ap-southeast-亚太东南 3 (吉隆坡)"
-    echo -e "\t${CMSG}15${CEND}. ap-southeast-亚太东南 5 (雅加达) ${CMSG}16${CEND}. ap-northeast-亚太东北 1 (日本)"
-    echo -e "\t${CMSG}17${CEND}. ap-south-亚太南部 1 (孟买)       ${CMSG}18${CEND}. eu-central-欧洲中部 1 (法兰克福)"
-    echo -e "\t${CMSG}19${CEND}. eu-west-英国（伦敦）             ${CMSG}20${CEND}. me-east-中东东部 1 (迪拜)"
+    echo -e "\t ${CMSG}1${CEND}. cn-hangzhou-华东1 (杭州)          ${CMSG}2${CEND}. cn-shanghai-华东2 (上海)"
+    echo -e "\t ${CMSG}3${CEND}. cn-qingdao-华北1 (青岛)           ${CMSG}4${CEND}. cn-beijing-华北2 (北京)"
+    echo -e "\t ${CMSG}5${CEND}. cn-zhangjiakou-华北3 (张家口)     ${CMSG}6${CEND}. cn-huhehaote-华北5(呼和浩特)"
+    echo -e "\t ${CMSG}7${CEND}. cn-wulanchabu-华北6（乌兰察布）   ${CMSG}8${CEND}. cn-shenzhen-华南1（深圳）"
+    echo -e "\t ${CMSG}9${CEND}. cn-heyuan-华南2（河源）	  ${CMSG}10${CEND}. cn-guangzhou-华南3（广州）"
+    echo -e "\t${CMSG}11${CEND}. cn-chengdu-西南1（成都）         ${CMSG}12${CEND}. cn-hongkong-香港"
+    echo -e "\t${CMSG}13${CEND}. us-west-1-美国（硅谷）           ${CMSG}14${CEND}. us-east-1-美国（弗吉尼亚）"
+    echo -e "\t${CMSG}15${CEND}. ap-southeast-1-新加坡            ${CMSG}16${CEND}. ap-southeast-2-澳大利亚（悉尼）"
+    echo -e "\t${CMSG}17${CEND}. ap-southeast-3-马来西亚（吉隆坡）${CMSG}18${CEND}. ap-southeast-5-印度尼西亚（雅加达）"
+    echo -e "\t${CMSG}19${CEND}. ap-northeast-1-日本（东京）      ${CMSG}20${CEND}. ap-south-1-印度（孟买）"
+    echo -e "\t${CMSG}21${CEND}. eu-central-1-德国（法兰克福）    ${CMSG}22${CEND}. eu-west-1-英国（伦敦）"
+    echo -e "\t${CMSG}23${CEND}. me-east-1-中东东部 (迪拜)        ${CMSG}24${CEND}. ap-southeast-6-菲律宾（马尼拉）"
     read -e -p "Please input a number:(Default 1 press Enter) " Location
     Location=${Location:-1}
-    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^20$ ]]; then
+    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^24$ ]]; then
       break
     else
-      echo "${CWARNING}input error! Please only input number 1~20${CEND}"
+      echo "${CWARNING}input error! Please only input number 1~24${CEND}"
     fi
   done
   [ "${Location}" == '1' ] && Host=oss-cn-hangzhou-internal.aliyuncs.com
@@ -211,20 +213,24 @@ if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   [ "${Location}" == '4' ] && Host=oss-cn-beijing-internal.aliyuncs.com
   [ "${Location}" == '5' ] && Host=oss-cn-zhangjiakou-internal.aliyuncs.com
   [ "${Location}" == '6' ] && Host=oss-cn-huhehaote-internal.aliyuncs.com
-  [ "${Location}" == '7' ] && Host=oss-cn-shenzhen-internal.aliyuncs.com
-  [ "${Location}" == '8' ] && Host=oss-cn-chengdu-internal.aliyuncs.com
-  [ "${Location}" == '9' ] && Host=oss-cn-hongkong-internal.aliyuncs.com
-  [ "${Location}" == '10' ] && Host=oss-us-west-1-internal.aliyuncs.com
-  [ "${Location}" == '11' ] && Host=oss-us-east-1-internal.aliyuncs.com
-  [ "${Location}" == '12' ] && Host=oss-ap-southeast-1-internal.aliyuncs.com
-  [ "${Location}" == '13' ] && Host=oss-ap-southeast-2-internal.aliyuncs.com
-  [ "${Location}" == '14' ] && Host=oss-ap-southeast-3-internal.aliyuncs.com
-  [ "${Location}" == '15' ] && Host=oss-ap-southeast-5-internal.aliyuncs.com
-  [ "${Location}" == '16' ] && Host=oss-ap-northeast-1-internal.aliyuncs.com
-  [ "${Location}" == '17' ] && Host=oss-ap-south-1-internal.aliyuncs.com
-  [ "${Location}" == '18' ] && Host=oss-eu-central-1-internal.aliyuncs.com
-  [ "${Location}" == '19' ] && Host=oss-eu-west-1-internal.aliyuncs.com
-  [ "${Location}" == '20' ] && Host=oss-me-east-1-internal.aliyuncs.com
+  [ "${Location}" == '7' ] && Host=oss-cn-wulanchabu-internal.aliyuncs.com
+  [ "${Location}" == '8' ] && Host=oss-cn-shenzhen-internal.aliyuncs.com
+  [ "${Location}" == '9' ] && Host=oss-cn-heyuan-internal.aliyuncs.com
+  [ "${Location}" == '10' ] && Host=oss-cn-guangzhou-internal.aliyuncs.com
+  [ "${Location}" == '11' ] && Host=oss-cn-chengdu-internal.aliyuncs.com
+  [ "${Location}" == '12' ] && Host=oss-cn-hongkong-internal.aliyuncs.com
+  [ "${Location}" == '13' ] && Host=oss-us-west-1-internal.aliyuncs.com
+  [ "${Location}" == '14' ] && Host=oss-us-east-1-internal.aliyuncs.com
+  [ "${Location}" == '15' ] && Host=oss-ap-southeast-1-internal.aliyuncs.com
+  [ "${Location}" == '16' ] && Host=oss-ap-southeast-2-internal.aliyuncs.com
+  [ "${Location}" == '17' ] && Host=oss-ap-southeast-3-internal.aliyuncs.com
+  [ "${Location}" == '18' ] && Host=oss-ap-southeast-5-internal.aliyuncs.com
+  [ "${Location}" == '19' ] && Host=oss-ap-northeast-1-internal.aliyuncs.com
+  [ "${Location}" == '20' ] && Host=oss-ap-south-1-internal.aliyuncs.com
+  [ "${Location}" == '21' ] && Host=oss-eu-central-1-internal.aliyuncs.com
+  [ "${Location}" == '22' ] && Host=oss-eu-west-1-internal.aliyuncs.com
+  [ "${Location}" == '23' ] && Host=oss-me-east-1-internal.aliyuncs.com
+  [ "${Location}" == '24' ] && Host=oss-ap-southeast-6-internal.aliyuncs.com
   [ "$(./include/check_port.py ${Host} 80)" == "False" ] && Host=`echo ${Host} | sed 's@-internal@@g'`
   [ -e "/root/.ossutilconfig" ] && rm -f /root/.ossutilconfig
   while :; do echo
@@ -258,43 +264,48 @@ if [ -n "`echo ${desc_bk} | grep -w 4`" ]; then
   while :; do echo
     echo 'Please select your backup qcloud datacenter:'
     echo -e "\t ${CMSG} 1${CEND}. ap-beijing-1-北京一区(华北)  ${CMSG}2${CEND}. ap-beijing-北京"
-    echo -e "\t ${CMSG} 3${CEND}. ap-shanghai-上海(华东)       ${CMSG}4${CEND}. ap-guangzhou-广州(华南)"
-    echo -e "\t ${CMSG} 5${CEND}. ap-chengdu-成都(西南)        ${CMSG}6${CEND}. ap-chongqing-重庆"
-    echo -e "\t ${CMSG} 7${CEND}. ap-shenzhen-fsi-深圳金融     ${CMSG}8${CEND}. ap-shanghai-fsi-上海金融"
-    echo -e "\t ${CMSG} 9${CEND}. ap-beijing-fsi-北京金融     ${CMSG}10${CEND}. ap-hongkong-香港"
-    echo -e "\t ${CMSG}11${CEND}. ap-singapore-新加坡         ${CMSG}12${CEND}. ap-mumbai-孟买"
-    echo -e "\t ${CMSG}13${CEND}. ap-seoul-首尔               ${CMSG}14${CEND}. ap-bangkok-曼谷"
-    echo -e "\t ${CMSG}15${CEND}. ap-tokyo-东京               ${CMSG}16${CEND}. na-siliconvalley-硅谷"
-    echo -e "\t ${CMSG}17${CEND}. na-ashburn-弗吉尼亚         ${CMSG}18${CEND}. na-toronto-多伦多"
-    echo -e "\t ${CMSG}19${CEND}. eu-frankfurt-法兰克福       ${CMSG}20${CEND}. eu-moscow-莫斯科"
+    echo -e "\t ${CMSG} 3${CEND}. ap-nanjing-南京              ${CMSG}4${CEND}. ap-shanghai-上海"
+    echo -e "\t ${CMSG} 5${CEND}. ap-guangzhou-广州            ${CMSG}6${CEND}. ap-chengdu-成都"
+    echo -e "\t ${CMSG} 7${CEND}. ap-chongqing-重庆            ${CMSG}8${CEND}. ap-shenzhen-fsi-深圳金融"
+    echo -e "\t ${CMSG} 9${CEND}. ap-shanghai-fsi-上海金融    ${CMSG}10${CEND}. ap-beijing-fsi-北京金融"
+    echo -e "\t ${CMSG}11${CEND}. ap-hongkong-香港            ${CMSG}11${CEND}. ap-singapore-新加坡"
+    echo -e "\t ${CMSG}13${CEND}. ap-mumbai-孟买              ${CMSG}14${CEND}. ap-jakarta-雅加达"
+    echo -e "\t ${CMSG}15${CEND}. ap-seoul-首尔               ${CMSG}16${CEND}. ap-bangkok-曼谷"
+    echo -e "\t ${CMSG}17${CEND}. ap-tokyo-东京               ${CMSG}18${CEND}. na-siliconvalley-硅谷（美西）"
+    echo -e "\t ${CMSG}19${CEND}. na-ashburn-弗吉尼亚（美东） ${CMSG}20${CEND}. na-toronto-多伦多"
+    echo -e "\t ${CMSG}21${CEND}. sa-saopaulo-圣保罗	      ${CMSG}22${CEND}. eu-frankfurt-法兰克福"
+    echo -e "\t ${CMSG}23${CEND}. eu-moscow-莫斯科"
     read -e -p "Please input a number:(Default 1 press Enter) " Location
     Location=${Location:-1}
-    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^20$ ]]; then
+    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^2[0-3]$ ]]; then
       break
     else
-      echo "${CWARNING}input error! Please only input number 1~17${CEND}"
+      echo "${CWARNING}input error! Please only input number 1~23${CEND}"
     fi
   done
   [ "${Location}" == '1' ] && REGION='ap-beijing-1'
   [ "${Location}" == '2' ] && REGION='ap-beijing'
-  [ "${Location}" == '3' ] && REGION='ap-shanghai'
-  [ "${Location}" == '4' ] && REGION='ap-guangzhou'
-  [ "${Location}" == '5' ] && REGION='ap-chengdu'
-  [ "${Location}" == '6' ] && REGION='ap-chongqing'
-  [ "${Location}" == '7' ] && REGION='ap-shenzhen-fsi'
-  [ "${Location}" == '8' ] && REGION='ap-shanghai-fsi'
-  [ "${Location}" == '9' ] && REGION='ap-beijing-fsi'
-  [ "${Location}" == '10' ] && REGION='ap-hongkong'
-  [ "${Location}" == '11' ] && REGION='ap-singapore'
-  [ "${Location}" == '12' ] && REGION='ap-mumbai'
-  [ "${Location}" == '13' ] && REGION='ap-seoul'
-  [ "${Location}" == '14' ] && REGION='ap-bangkok'
-  [ "${Location}" == '15' ] && REGION='ap-tokyo'
-  [ "${Location}" == '16' ] && REGION='na-siliconvalley'
-  [ "${Location}" == '17' ] && REGION='na-ashburn'
-  [ "${Location}" == '18' ] && REGION='na-toronto'
-  [ "${Location}" == '19' ] && REGION='eu-frankfurt'
-  [ "${Location}" == '20' ] && REGION='eu-moscow'
+  [ "${Location}" == '3' ] && REGION='ap-nanjing'
+  [ "${Location}" == '4' ] && REGION='ap-shanghai'
+  [ "${Location}" == '5' ] && REGION='ap-guangzhou'
+  [ "${Location}" == '6' ] && REGION='ap-chengdu'
+  [ "${Location}" == '7' ] && REGION='ap-chongqing'
+  [ "${Location}" == '8' ] && REGION='ap-shenzhen-fsi'
+  [ "${Location}" == '9' ] && REGION='ap-shanghai-fsi'
+  [ "${Location}" == '10' ] && REGION='ap-beijing-fsi'
+  [ "${Location}" == '11' ] && REGION='ap-hongkong'
+  [ "${Location}" == '12' ] && REGION='ap-singapore'
+  [ "${Location}" == '13' ] && REGION='ap-mumbai'
+  [ "${Location}" == '14' ] && REGION='ap-jakarta'
+  [ "${Location}" == '15' ] && REGION='ap-seoul'
+  [ "${Location}" == '16' ] && REGION='ap-bangkok'
+  [ "${Location}" == '17' ] && REGION='ap-tokyo'
+  [ "${Location}" == '18' ] && REGION='na-siliconvalley'
+  [ "${Location}" == '19' ] && REGION='na-ashburn'
+  [ "${Location}" == '20' ] && REGION='na-toronto'
+  [ "${Location}" == '21' ] && REGION='sa-saopaulo'
+  [ "${Location}" == '22' ] && REGION='eu-frankfurt'
+  [ "${Location}" == '23' ] && REGION='eu-moscow'
   while :; do echo
     read -e -p "Please enter the Qcloud COS APPID: " APPID
     [[ ! "${APPID}" =~ ^[0-9]+$ ]] && { echo "${CWARNING}input error, must be a number${CEND}"; continue; }
@@ -336,11 +347,11 @@ fi
 if [ -n "`echo ${desc_bk} | grep -w 5`" ]; then
   if [ ! -e "/usr/local/bin/upx" ]; then
     if [ "${OS_BIT}" == '64' ]; then
-      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.5_linux_x86_64.tar.gz -O /tmp/upx_0.3.5_linux_x86_64.tar.gz
-      tar xzf /tmp/upx_0.3.5_linux_x86_64.tar.gz -C /tmp/
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_x86_64.tar.gz -O /tmp/upx_0.3.6_linux_x86_64.tar.gz
+      tar xzf /tmp/upx_0.3.6_linux_x86_64.tar.gz -C /tmp/
     elif [ "${OS_BIT}" == '32' ]; then
-      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.5_linux_i386.tar.gz -O /tmp/upx_0.3.5_linux_i386.tar.gz 
-      tar xzf /tmp/upx_0.3.5_linux_i386.tar.gz -C /tmp/
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_i386.tar.gz -O /tmp/upx_0.3.6_linux_i386.tar.gz
+      tar xzf /tmp/upx_0.3.6_linux_i386.tar.gz -C /tmp/
     fi
     /bin/mv /tmp/upx /usr/local/bin/upx
     chmod +x /usr/local/bin/upx
@@ -381,7 +392,7 @@ if [ -n "`echo ${desc_bk} | grep -w 6`" ]; then
       wget -qc https://devtools.qiniu.com/qshell-v2.5.0-linux-amd64.tar.gz -O /tmp/qshell-v2.5.0-linux-amd64.tar.gz
       tar xzf /tmp/qshell-v2.5.0-linux-amd64.tar.gz -C /usr/local/bin/
     elif [ "${OS_BIT}" == '32' ]; then
-      wget -qc https://devtools.qiniu.com/qshell-v2.5.0-linux-386.tar.gz -O /tmp/qshell-v2.5.0-linux-386.tar.gz 
+      wget -qc https://devtools.qiniu.com/qshell-v2.5.0-linux-386.tar.gz -O /tmp/qshell-v2.5.0-linux-386.tar.gz
       tar xzf /tmp/qshell-v2.5.0-linux-386.tar.gz -C /usr/local/bin/
     fi
     chmod +x /usr/local/bin/qshell

include/check_download.sh

@@ -714,10 +714,10 @@ checkDownload() {
   fi
 
   # nodejs
-  if [ "${node_flag}" == 'y' ]; then
+  if [ "${nodejs_flag}" == 'y' ]; then
     echo "Download Nodejs..."
     [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_NODE=https://nodejs.org/dist || DOWN_ADDR_NODE=https://mirrors.tuna.tsinghua.edu.cn/nodejs-release
-    src_url=${DOWN_ADDR_NODE}/v${node_ver}/node-v${node_ver}-linux-${SYS_BIT_n}.tar.gz && Download_src
+    src_url=${DOWN_ADDR_NODE}/v${nodejs_ver}/node-v${nodejs_ver}-linux-${SYS_BIT_n}.tar.gz && Download_src
   fi
 
   # pureftpd

include/check_os.sh

@@ -99,7 +99,7 @@ if [ "$(getconf WORD_BIT)" == "32" ] && [ "$(getconf LONG_BIT)" == "64" ]; then
   SYS_BIT_b=x86_64 #mariadb
   SYS_BIT_c=x86_64 #ZendGuardLoader
   SYS_BIT_d=x86-64 #ioncube
-  SYS_BIT_n=x64 #node
+  SYS_BIT_n=x64 #nodejs
   [ "${TARGET_ARCH}" == 'aarch64' ] && { SYS_BIT_j=aarch64; SYS_BIT_c=aarch64; SYS_BIT_d=aarch64; SYS_BIT_n=arm64; }
 else
   OS_BIT=32

include/node.sh → include/nodejs.sh

@@ -8,13 +8,13 @@
 #       https://oneinstack.com
 #       https://github.com/oneinstack/oneinstack
 
-Install_Node() {
+Install_Nodejs() {
   pushd ${oneinstack_dir}/src > /dev/null
-  tar xzf node-v${node_ver}-linux-${SYS_BIT_n}.tar.gz
-  /bin/mv node-v${node_ver}-linux-${SYS_BIT_n} ${node_install_dir}
-  if [ -e "${node_install_dir}/bin/node" ]; then
-    cat > /etc/profile.d/node.sh << EOF
-export NODE_HOME=${node_install_dir}
+  tar xzf node-v${nodejs_ver}-linux-${SYS_BIT_n}.tar.gz
+  /bin/mv node-v${nodejs_ver}-linux-${SYS_BIT_n} ${nodejs_install_dir}
+  if [ -e "${nodejs_install_dir}/bin/node" ]; then
+    cat > /etc/profile.d/nodejs.sh << EOF
+export NODE_HOME=${nodejs_install_dir}
 export PATH=\$NODE_HOME/bin:\$PATH
 EOF
     . /etc/profile
@@ -26,10 +26,10 @@ EOF
   popd > /dev/null
 }
 
-Uninstall_Node() {
-  if [ -e "${node_install_dir}" ]; then
-    rm -rf ${node_install_dir} /etc/profile.d/node.sh
-    echo "${CMSG}Node uninstall completed! ${CEND}"
+Uninstall_Nodejs() {
+  if [ -e "${nodejs_install_dir}" ]; then
+    rm -rf ${nodejs_install_dir} /etc/profile.d/nodejs.sh
+    echo "${CMSG}Nodejs uninstall completed! ${CEND}"
   fi
 }
 

include/php-8.0.sh

@@ -111,7 +111,7 @@ Install_PHP80() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-apxs2=${apache_install_dir}/bin/apxs ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv --with-freetype --with-jpeg --with-zlib \
+    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
@@ -122,14 +122,14 @@ Install_PHP80() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-fpm-user=${run_user} --with-fpm-group=${run_group} --enable-fpm ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv --with-freetype --with-jpeg --with-zlib \
+    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --enable-ftp --enable-intl --with-xsl \
     --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
   fi
-  make ZEND_EXTRA_LIBS="-L${libiconv_install_dir}/lib/ -liconv" -j ${THREAD}
+  make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make install
 
   if [ -e "${php_install_dir}/bin/phpize" ]; then

include/php-8.1.sh

@@ -111,7 +111,7 @@ Install_PHP81() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-apxs2=${apache_install_dir}/bin/apxs ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv --with-freetype --with-jpeg --with-zlib \
+    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
@@ -122,14 +122,14 @@ Install_PHP81() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-fpm-user=${run_user} --with-fpm-group=${run_group} --enable-fpm ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv --with-freetype --with-jpeg --with-zlib \
+    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --enable-ftp --enable-intl --with-xsl \
     --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
   fi
-  make ZEND_EXTRA_LIBS="-L${libiconv_install_dir}/lib/ -liconv" -j ${THREAD}
+  make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make install
 
   if [ -e "${php_install_dir}/bin/phpize" ]; then

install.sh

@@ -56,7 +56,7 @@ Show_Help() {
   --php_extensions [ext name] Install PHP extensions, include zendguardloader,ioncube,
                               sourceguardian,imagick,gmagick,fileinfo,imap,ldap,calendar,phalcon,
                               yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
-  --node                      Install Nodejs
+  --nodejs                    Install Nodejs
   --tomcat_option [1-4]       Install Tomcat version
   --jdk_option [1-4]          Install JDK version
   --db_option [1-14]          Install DB version
@@ -73,7 +73,7 @@ Show_Help() {
   "
 }
 ARG_NUM=$#
-TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,node,tomcat_option:,jdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
+TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,nodejs,tomcat_option:,jdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
 [ $? != 0 ] && echo "${CWARNING}ERROR: unknown argument! ${CEND}" && Show_Help && exit 1
 eval set -- "${TEMP}"
 while :; do
@@ -140,9 +140,9 @@ while :; do
       [ -n "`echo ${php_extensions} | grep -w swoole`" ] && pecl_swoole=1
       [ -n "`echo ${php_extensions} | grep -w xdebug`" ] && pecl_xdebug=1
       ;;
-    --node)
-      node_flag=y; shift 1
-      [ -e "${node_install_dir}/bin/node" ] && { echo "${CWARNING}Nodejs already installed! ${CEND}"; unset node_flag; }
+    --nodejs)
+      nodejs_flag=y; shift 1
+      [ -e "${nodejs_install_dir}/bin/node" ] && { echo "${CWARNING}Nodejs already installed! ${CEND}"; unset nodejs_flag; }
       ;;
     --tomcat_option)
       tomcat_option=$2; shift 2
@@ -651,11 +651,11 @@ if [ ${ARG_NUM} == 0 ]; then
 
   # check Nodejs
   while :; do echo
-    read -e -p "Do you want to install Nodejs? [y/n]: " node_flag
-    if [[ ! ${node_flag} =~ ^[y,n]$ ]]; then
+    read -e -p "Do you want to install Nodejs? [y/n]: " nodejs_flag
+    if [[ ! ${nodejs_flag} =~ ^[y,n]$ ]]; then
       echo "${CWARNING}input error! Please only input 'y' or 'n'${CEND}"
     else
-      [ "${node_flag}" == 'y' -a -e "${node_install_dir}/bin/node" ] && { echo "${CWARNING}Nodejs already installed! ${CEND}"; unset node_flag; }
+      [ "${nodejs_flag}" == 'y' -a -e "${nodejs_install_dir}/bin/node" ] && { echo "${CWARNING}Nodejs already installed! ${CEND}"; unset nodejs_flag; }
       break
     fi
   done
@@ -1098,9 +1098,9 @@ case "${tomcat_option}" in
 esac
 
 # Nodejs
-if [ "${node_flag}" == 'y' ]; then
-  . include/node.sh
-  Install_Node 2>&1 | tee -a ${oneinstack_dir}/install.log
+if [ "${nodejs_flag}" == 'y' ]; then
+  . include/nodejs.sh
+  Install_Nodejs 2>&1 | tee -a ${oneinstack_dir}/install.log
 fi
 
 # Pure-FTPd

options.conf

@@ -21,7 +21,7 @@ mongo_install_dir=/usr/local/mongodb
 
 php_install_dir=/usr/local/php
 
-node_install_dir=/usr/local/node
+nodejs_install_dir=/usr/local/node
 
 pureftpd_install_dir=/usr/local/pureftpd
 

uninstall.sh

@@ -49,7 +49,7 @@ Show_Help() {
   --memcached                   Uninstall Memcached-server
   --phpmyadmin                  Uninstall phpMyAdmin
   --python                      Uninstall Python (PATH: ${python_install_dir})
-  --node                        Uninstall Nodejs (PATH: ${node_install_dir})
+  --node                        Uninstall Nodejs (PATH: ${nodejs_install_dir})
   "
 }
 
@@ -75,7 +75,7 @@ while :; do
       postgresql_flag=y
       mongodb_flag=y
       allphp_flag=y
-      node_flag=y
+      nodejs_flag=y
       pureftpd_flag=y
       redis_flag=y
       memcached_flag=y
@@ -130,7 +130,7 @@ while :; do
       [ -n "`echo ${php_extensions} | grep -w xdebug`" ] && pecl_xdebug=1
       ;;
     --node)
-      node_flag=y; shift 1
+      nodejs_flag=y; shift 1
       ;;
     --pureftpd)
       pureftpd_flag=y; shift 1
@@ -569,9 +569,9 @@ Print_Python() {
   [ -d "${python_install_dir}" ] && echo ${python_install_dir}
 }
 
-Print_Node() {
-  [ -e "${node_install_dir}" ] && echo ${node_install_dir}
-  [ -e "/etc/profile.d/node.sh" ] && echo /etc/profile.d/node.sh
+Print_Nodejs() {
+  [ -e "${nodejs_install_dir}" ] && echo ${nodejs_install_dir}
+  [ -e "/etc/profile.d/nodejs.sh" ] && echo /etc/profile.d/nodejs.sh
 }
 
 Menu() {
@@ -591,7 +591,7 @@ What Are You Doing?
 \t${CMSG}10${CEND}. Uninstall Memcached
 \t${CMSG}11${CEND}. Uninstall phpMyAdmin
 \t${CMSG}12${CEND}. Uninstall Python (PATH: ${python_install_dir})
-\t${CMSG}13${CEND}. Uninstall Nodejs (PATH: ${node_install_dir})
+\t${CMSG}13${CEND}. Uninstall Nodejs (PATH: ${nodejs_install_dir})
 \t${CMSG} q${CEND}. Exit
 "
   echo
@@ -613,7 +613,7 @@ What Are You Doing?
       Print_openssl
       Print_phpMyAdmin
       Print_Python
-      Print_Node
+      Print_Nodejs
       Uninstall_status
       if [ "${uninstall_flag}" == 'y' ]; then
         Uninstall_Web
@@ -627,7 +627,7 @@ What Are You Doing?
         Uninstall_openssl
         Uninstall_phpMyAdmin
         . include/python.sh; Uninstall_Python
-        . include/node.sh; Uninstall_Node
+        . include/nodejs.sh; Uninstall_Nodejs
       else
         exit
       fi
@@ -696,9 +696,9 @@ What Are You Doing?
       [ "${uninstall_flag}" == 'y' ] && { . include/python.sh; Uninstall_Python; } || exit
       ;;
     13)
-      Print_Node
+      Print_Nodejs
       Uninstall_status
-      [ "${uninstall_flag}" == 'y' ] && { . include/node.sh; Uninstall_Node; } || exit
+      [ "${uninstall_flag}" == 'y' ] && { . include/nodejs.sh; Uninstall_Nodejs; } || exit
       ;;
     q)
       exit
@@ -726,7 +726,7 @@ else
   [ "${memcached_flag}" == 'y' ] && Print_Memcached_server
   [ "${phpmyadmin_flag}" == 'y' ] && Print_phpMyAdmin
   [ "${python_flag}" == 'y' ] && Print_Python
-  [ "${node_flag}" == 'y' ] && Print_Node
+  [ "${nodejs_flag}" == 'y' ] && Print_Nodejs
   [ "${all_flag}" == 'y' ] && Print_openssl
   Uninstall_status
   if [ "${uninstall_flag}" == 'y' ]; then
@@ -749,7 +749,7 @@ else
     [ "${memcached_flag}" == 'y' ] && Uninstall_Memcached_server
     [ "${phpmyadmin_flag}" == 'y' ] && Uninstall_phpMyAdmin
     [ "${python_flag}" == 'y' ] && { . include/python.sh; Uninstall_Python; }
-    [ "${node_flag}" == 'y' ] && { . include/node.sh; Uninstall_Node; }
+    [ "${nodejs_flag}" == 'y' ] && { . include/nodejs.sh; Uninstall_Nodejs; }
     [ "${all_flag}" == 'y' ] && Uninstall_openssl
   fi
 fi

versions.txt

@@ -3,12 +3,12 @@
 nginx_ver=1.20.2
 tengine_ver=2.3.3
 openresty_ver=1.19.9.1
-openssl11_ver=1.1.1k
+openssl11_ver=1.1.1m
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.13
-tomcat9_ver=9.0.55
-tomcat8_ver=8.5.73
+tomcat10_ver=10.0.16
+tomcat9_ver=9.0.58
+tomcat8_ver=8.5.75
 tomcat7_ver=7.0.109
 
 apache_ver=2.4.52
@@ -18,18 +18,18 @@ apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.27
-mysql57_ver=5.7.36
+mysql80_ver=8.0.28
+mysql57_ver=5.7.37
 mysql56_ver=5.6.50
 mysql55_ver=5.5.62
 
-mariadb106_ver=10.6.5
-mariadb105_ver=10.5.13
-mariadb104_ver=10.4.22
+mariadb106_ver=10.6.7
+mariadb105_ver=10.5.15
+mariadb104_ver=10.4.24
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.26-16
-percona57_ver=5.7.35-38
+percona80_ver=8.0.26-17
+percona57_ver=5.7.36-39
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
 
@@ -53,11 +53,11 @@ php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
 php74_ver=7.4.27
-php80_ver=8.0.14
-php81_ver=8.1.1
+php80_ver=8.0.15
+php81_ver=8.1.2
 
 # Nodejs
-node_ver=14.18.1
+nodejs_ver=16.13.2
 
 libiconv_ver=1.16
 curl_ver=7.79.1
@@ -69,7 +69,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-19
+imagemagick_ver=7.1.0-24
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -84,9 +84,9 @@ phalcon_ver=4.1.2
 phalcon_oldver=3.4.5
 yaf_ver=3.3.2
 yar_ver=2.2.0
-swoole_ver=4.6.7
+swoole_ver=4.8.6
 swoole_oldver=4.5.2
-xdebug_ver=3.0.4
+xdebug_ver=3.1.2
 xdebug_oldver=2.9.8
 
 # Ftp
@@ -95,11 +95,11 @@ pureftpd_ver=1.0.49
 # Redis
 redis_ver=6.2.6
 redis_oldver=5.0.14
-pecl_redis_ver=5.3.4
+pecl_redis_ver=5.3.6
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.12
+memcached_ver=1.6.13
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
@@ -107,12 +107,12 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.11.0
+pecl_mongodb_ver=1.12.0
 pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=5.1.1
+phpmyadmin_ver=5.1.3
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
@@ -125,7 +125,7 @@ boost_oldver=1.59.0
 
 # Others
 lua_nginx_module_ver=0.10.20
-luajit2_ver=2.1-20210510
+luajit2_ver=2.1-20220111
 lua_resty_core_ver=0.1.22
 lua_resty_lrucache_ver=0.11
 lua_cjson_ver=2.1.0.8