Update python.sh and versions.txt

include/python.sh

@@ -44,7 +44,7 @@ EOF
     done
   fi
 
-  # Install Python
+  # Install Python3
   if [ ! -e "${python_install_dir}/bin/python" -a ! -e "${python_install_dir}/bin/python3" ] ;then
     src_url=http://mirrors.linuxeye.com/oneinstack/src/Python-${python_ver}.tgz && Download_src
     tar xzf Python-${python_ver}.tgz
@@ -52,28 +52,11 @@ EOF
     ./configure --prefix=${python_install_dir}
     make && make install
     [ ! -e "${python_install_dir}/bin/python" -a -e "${python_install_dir}/bin/python3" ] && ln -s ${python_install_dir}/bin/python{3,}
+    [ ! -e "${python_install_dir}/bin/pip" -a -e "${python_install_dir}/bin/pip3" ] && ln -s ${python_install_dir}/bin/pip{3,}
     popd
     rm -rf Python-${python_ver}
   fi
 
-  if [ ! -e "${python_install_dir}/bin/easy_install" ] ;then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/setuptools-${setuptools_ver}.zip && Download_src
-    unzip -q setuptools-${setuptools_ver}.zip
-    pushd setuptools-${setuptools_ver}
-    ${python_install_dir}/bin/python setup.py install
-    popd
-    rm -rf setuptools-${setuptools_ver}
-  fi
-
-  if [ ! -e "${python_install_dir}/bin/pip" ] ;then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/pip-${pip_ver}.tar.gz && Download_src
-    tar xzf pip-${pip_ver}.tar.gz
-    pushd pip-${pip_ver}
-    ${python_install_dir}/bin/python setup.py install
-    popd
-    rm -rf pip-${pip_ver}
-  fi
-
   if [ ! -e "/root/.pip/pip.conf" ] ;then
     # get the IP information
     PUBLIC_IPADDR=$(../include/get_public_ipaddr.py)

tools/db_bk.sh

@@ -33,7 +33,7 @@ if [ -e "${NewFile}" ]; then
   echo "[${NewFile}] The Backup File is exists, Can't Backup" >> ${LogFile}
 else
   ${db_install_dir}/bin/mysqldump -uroot -p${dbrootpwd} --databases ${DBname} > ${DumpFile}
-  pushd ${backup_dir}
+  pushd ${backup_dir} > /dev/null
   tar czf ${NewFile} ${DumpFile##*/} >> ${LogFile} 2>&1
   echo "[${NewFile}] Backup success ">> ${LogFile}
   rm -f ${DumpFile}

versions.txt

@@ -55,13 +55,13 @@ php54_ver=5.4.45
 php53_ver=5.3.29
 
 libiconv_ver=1.15
-curl_ver=7.60.0
+curl_ver=7.61.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-7
+imagemagick_ver=6.9.10-8
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -69,9 +69,9 @@ gmagick_ver=1.1.7RC3
 zendopcache_ver=7.0.5
 xcache_ver=3.2.0
 apcu_ver=4.0.11
-apcu_for_php7_ver=5.1.11
+apcu_for_php7_ver=5.1.12
 eaccelerator_ver=0.9.6.1
-swoole_ver=4.0.2
+swoole_ver=4.0.3
 xdebug_ver=2.6.0
 
 # Ftp
@@ -109,6 +109,4 @@ tmux_ver=2.7
 htop_ver=2.2.0
 bison_ver=2.7.1
 python_ver=3.6.6
-setuptools_ver=39.2.0
-pip_ver=10.0.1
 fail2ban_ver=0.10.3.1