[feat] Update

include/demo.sh

@@ -39,7 +39,7 @@ DEMO() {
         ;;
     esac
   fi
-  chown -R ${run_user}.${run_group} ${wwwroot_dir}/default
+  chown -R ${run_user}:${run_group} ${wwwroot_dir}/default
   [ -e /bin/systemctl ] && systemctl daemon-reload
   popd > /dev/null
 }

include/eaccelerator.sh

@@ -28,7 +28,7 @@ Install_eAccelerator() {
       make -j ${THREAD} && make install
       popd > /dev/null
       if [ -f "${phpExtensionDir}/eaccelerator.so" ]; then
-        mkdir /var/eaccelerator_cache;chown -R ${run_user}.${run_group} /var/eaccelerator_cache
+        mkdir /var/eaccelerator_cache;chown -R ${run_user}:${run_group} /var/eaccelerator_cache
         cat > ${php_install_dir}/etc/php.d/02-eaccelerator.ini << EOF
 [eaccelerator]
 zend_extension=${phpExtensionDir}/eaccelerator.so

include/hhvm_CentOS.sh

@@ -50,7 +50,7 @@ EOF
   userdel -r nginx;userdel -r saslauth
   rm -rf /var/log/hhvm
   mkdir /var/log/hhvm
-  chown -R ${run_user}.${run_group} /var/log/hhvm
+  chown -R ${run_user}:${run_group} /var/log/hhvm
   cat > /etc/hhvm/config.hdf << EOF
 ResourceLimit {
   CoreFileSize = 0          # in bytes

include/jdk-1.6.sh

@@ -20,7 +20,7 @@ Install_JDK16() {
   [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
   /bin/cp -R ${JDK_NAME} ${JAVA_dir}
   if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}.${run_group} ${JDK_PATH}
+    chown -R ${run_user}:${run_group} ${JDK_PATH}
     [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
     [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
     [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile

include/jdk-1.7.sh

@@ -18,7 +18,7 @@ Install_JDK17() {
   [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
   tar xzf ${JDK_FILE} -C ${JAVA_dir}
   if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}.${run_group} ${JDK_PATH}
+    chown -R ${run_user}:${run_group} ${JDK_PATH}
     /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
     [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
     [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile

include/jdk-1.8.sh

@@ -18,7 +18,7 @@ Install_JDK18() {
   [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
   tar xzf ${JDK_FILE} -C ${JAVA_dir}
   if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}.${run_group} ${JDK_PATH}
+    chown -R ${run_user}:${run_group} ${JDK_PATH}
     /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
     [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
     [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile

include/jdk-11.0.sh

@@ -18,7 +18,7 @@ Install_JDK110() {
   [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
   tar xzf ${JDK_FILE} -C ${JAVA_dir}
   if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}.${run_group} ${JDK_PATH}
+    chown -R ${run_user}:${run_group} ${JDK_PATH}
     /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
     [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
     [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile

include/ngx_lua_waf.sh

@@ -146,7 +146,7 @@ enable_lua_waf() {
   if [ $? -eq 0 ]; then
     service nginx reload
     echo "${CSUCCESS}ngx_lua_waf enabled successfully! ${CEND}"
-    chown ${run_user}.${run_group} ${wwwlogs_dir}
+    chown ${run_user}:${run_group} ${wwwlogs_dir}
   else
     echo "${CFAILURE}ngx_lua_waf enable failed! ${CEND}"
   fi

include/pecl_xdebug.sh

@@ -32,9 +32,9 @@ Install_pecl_xdebug() {
         src_url=http://mirrors.linuxeye.com/oneinstack/src/webgrind-master.zip && Download_src
         unzip -q webgrind-master.zip
         /bin/mv webgrind-master ${wwwroot_dir}/default/webgrind
-        [ ! -e /tmp/xdebug ] && { mkdir /tmp/xdebug; chown ${run_user}.${run_group} /tmp/xdebug; }
-        [ ! -e /tmp/webgrind ] && { mkdir /tmp/webgrind; chown ${run_user}.${run_group} /tmp/webgrind; }
-        chown -R ${run_user}.${run_group} ${wwwroot_dir}/default/webgrind
+        [ ! -e /tmp/xdebug ] && { mkdir /tmp/xdebug; chown ${run_user}:${run_group} /tmp/xdebug; }
+        [ ! -e /tmp/webgrind ] && { mkdir /tmp/webgrind; chown ${run_user}:${run_group} /tmp/webgrind; }
+        chown -R ${run_user}:${run_group} ${wwwroot_dir}/default/webgrind
         sed -i 's@static $storageDir.*@static $storageDir = "/tmp/webgrind";@' ${wwwroot_dir}/default/webgrind/config.php
         sed -i 's@static $profilerDir.*@static $profilerDir = "/tmp/xdebug";@' ${wwwroot_dir}/default/webgrind/config.php
         cat > ${php_install_dir}/etc/php.d/08-xdebug.ini << EOF

include/phpmyadmin.sh

@@ -26,7 +26,7 @@ Install_phpMyAdmin() {
     sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@host'\].*@host'\] = '127.0.0.1';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@blowfish_secret.*;@blowfish_secret\'\] = \'$(cat /dev/urandom | head -1 | base64 | head -c 45)\';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
-    chown -R ${run_user}.${run_group} ${wwwroot_dir}/default/phpMyAdmin
+    chown -R ${run_user}:${run_group} ${wwwroot_dir}/default/phpMyAdmin
     popd > /dev/null
   fi
 }

include/tomcat-6.sh

@@ -130,7 +130,7 @@ EOF
 monitorRole  $(cat /dev/urandom | head -1 | md5sum | head -c 8)
 # controlRole   R&D
 EOF
-    chown -R ${run_user}.${run_group} ${tomcat_install_dir}
+    chown -R ${run_user}:${run_group} ${tomcat_install_dir}
     /bin/cp ${oneinstack_dir}/init.d/Tomcat-init /etc/init.d/tomcat
     sed -i "s@JAVA_HOME=.*@JAVA_HOME=${JAVA_HOME}@" /etc/init.d/tomcat
     sed -i "s@^CATALINA_HOME=.*@CATALINA_HOME=${tomcat_install_dir}@" /etc/init.d/tomcat

include/tomcat-7.sh

@@ -130,7 +130,7 @@ EOF
 monitorRole  $(cat /dev/urandom | head -1 | md5sum | head -c 8)
 # controlRole   R&D
 EOF
-    chown -R ${run_user}.${run_group} ${tomcat_install_dir}
+    chown -R ${run_user}:${run_group} ${tomcat_install_dir}
     /bin/cp ${oneinstack_dir}/init.d/Tomcat-init /etc/init.d/tomcat
     sed -i "s@JAVA_HOME=.*@JAVA_HOME=${JAVA_HOME}@" /etc/init.d/tomcat
     sed -i "s@^CATALINA_HOME=.*@CATALINA_HOME=${tomcat_install_dir}@" /etc/init.d/tomcat

include/tomcat-8.sh

@@ -130,7 +130,7 @@ EOF
 monitorRole  $(cat /dev/urandom | head -1 | md5sum | head -c 8)
 # controlRole   R&D
 EOF
-    chown -R ${run_user}.${run_group} ${tomcat_install_dir}
+    chown -R ${run_user}:${run_group} ${tomcat_install_dir}
     /bin/cp ${oneinstack_dir}/init.d/Tomcat-init /etc/init.d/tomcat
     sed -i "s@JAVA_HOME=.*@JAVA_HOME=${JAVA_HOME}@" /etc/init.d/tomcat
     sed -i "s@^CATALINA_HOME=.*@CATALINA_HOME=${tomcat_install_dir}@" /etc/init.d/tomcat

include/tomcat-9.sh

@@ -129,7 +129,7 @@ EOF
 monitorRole  $(cat /dev/urandom | head -1 | md5sum | head -c 8)
 # controlRole   R&D
 EOF
-    chown -R ${run_user}.${run_group} ${tomcat_install_dir}
+    chown -R ${run_user}:${run_group} ${tomcat_install_dir}
     /bin/cp ${oneinstack_dir}/init.d/Tomcat-init /etc/init.d/tomcat
     sed -i "s@JAVA_HOME=.*@JAVA_HOME=${JAVA_HOME}@" /etc/init.d/tomcat
     sed -i "s@^CATALINA_HOME=.*@CATALINA_HOME=${tomcat_install_dir}@" /etc/init.d/tomcat

include/upgrade_phpmyadmin.sh

@@ -47,7 +47,7 @@ Upgrade_phpMyAdmin() {
     sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@host'\].*@host'\] = '127.0.0.1';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@blowfish_secret.*;@blowfish_secret\'\] = \'$(cat /dev/urandom | head -1 | base64 | head -c 45)\';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
-    chown -R ${run_user}.${run_group} ${wwwroot_dir}/default/phpMyAdmin
+    chown -R ${run_user}:${run_group} ${wwwroot_dir}/default/phpMyAdmin
     echo "You have ${CMSG}successfully${CEND} upgrade from ${CWARNING}$OLD_phpmyadmin_ver${CEND} to ${CWARNING}$NEW_phpmyadmin_ver${CEND}"
   fi
   popd > /dev/null

include/upgrade_web.sh

@@ -326,7 +326,7 @@ Upgrade_Tomcat() {
     [[ -d ${tomcat_install_dir}_bak && -d ${tomcat_install_dir} ]] && rm -rf ${tomcat_install_dir}._bak
     service tomcat stop
     /bin/mv ${tomcat_install_dir}{,_bak}
-    /bin/mv apache-tomcat-${NEW_tomcat_ver} ${tomcat_install_dir} && chown -R ${run_user}.${run_group} ${tomcat_install_dir}
+    /bin/mv apache-tomcat-${NEW_tomcat_ver} ${tomcat_install_dir} && chown -R ${run_user}:${run_group} ${tomcat_install_dir}
     if [ -e "${tomcat_install_dir}/conf/server.xml" ]; then
       service tomcat start
       echo "You have ${CMSG}successfully${CEND} upgrade from ${CWARNING}${OLD_tomcat_ver}${CEND} to ${CWARNING}${NEW_tomcat_ver}${CEND}"

include/xcache.sh

@@ -23,8 +23,8 @@ Install_XCache() {
       if [ -f "${phpExtensionDir}/xcache.so" ]; then
         /bin/cp -R htdocs ${wwwroot_dir}/default/xcache
         popd > /dev/null
-        chown -R ${run_user}.${run_group} ${wwwroot_dir}/default/xcache
-        touch /tmp/xcache;chown ${run_user}.${run_group} /tmp/xcache
+        chown -R ${run_user}:${run_group} ${wwwroot_dir}/default/xcache
+        touch /tmp/xcache;chown ${run_user}:${run_group} /tmp/xcache
         let xcacheCount="${CPU}+1"
         let xcacheSize="${Memory_limit}/2"
         cat > ${php_install_dir}/etc/php.d/04-xcache.ini << EOF

versions.txt

@@ -59,7 +59,7 @@ php74_ver=7.4.13
 php80_ver=8.0.0
 
 libiconv_ver=1.16
-curl_ver=7.73.0
+curl_ver=7.74.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -68,7 +68,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.0.10-43
+imagemagick_ver=7.0.10-48
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.35
 gmagick_ver=2.0.5RC1
@@ -97,7 +97,7 @@ pecl_redis_ver=5.3.2
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.8
+memcached_ver=1.6.9
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
@@ -105,7 +105,7 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.8.2
+pecl_mongodb_ver=1.9.0
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin

vhost.sh

@@ -465,7 +465,7 @@ What Are You Doing?
         echo "Create Virtul Host directory......"
         mkdir -p ${vhostdir}
         echo "set permissions of Virtual Host directory......"
-        chown -R ${run_user}.${run_group} ${vhostdir}
+        chown -R ${run_user}:${run_group} ${vhostdir}
         break
       fi
     done