lj2007331 8 years ago
parent
commit
60ba458d43
3 changed files with 10 additions and 3 deletions
  1. 4 1
      install.sh
  2. 4 0
      ss.sh
  3. 2 2
      versions.txt

+ 4 - 1
install.sh

@@ -464,6 +464,7 @@ case "${OS}" in
 esac
 
 # init
+startTime=`date +%s`
 . ./include/memory.sh
 case "${OS}" in
   "CentOS")
@@ -734,8 +735,10 @@ fi
 # Starting DB
 [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 [ -d "${db_install_dir}/support-files" -a -z "$(ps -ef | grep -v grep | grep mysql)" ] && /etc/init.d/mysqld start
-
+endTime=`date +%s`
+((installTime=($endTime-$startTime)/60))
 echo "####################Congratulations########################"
+echo "Total OneinStack Install Time: ${CQUESTION}${installTime}${CEND} minutes"
 [ "${Web_yn}" == 'y' -a "${Nginx_version}" != '4' -a "${Apache_version}" == '3' ] && echo -e "\n$(printf "%-32s" "Nginx install dir":)${CMSG}${web_install_dir}${CEND}"
 [ "${Web_yn}" == 'y' -a "${Nginx_version}" != '4' -a "${Apache_version}" != '3' ] && echo -e "\n$(printf "%-32s" "Nginx install dir":)${CMSG}${web_install_dir}${CEND}\n$(printf "%-32s" "Apache install  dir":)${CMSG}${apache_install_dir}${CEND}"
 [ "${Web_yn}" == 'y' -a "${Nginx_version}" == '4' -a "${Apache_version}" != '3' ] && echo -e "\n$(printf "%-32s" "Apache install dir":)${CMSG}${apache_install_dir}${CEND}"

+ 4 - 0
ss.sh

@@ -19,8 +19,12 @@ printf "
 #######################################################################
 "
 
+# get pwd
+sed -i "s@^oneinstack_dir.*@oneinstack_dir=$(pwd)@" ./options.conf
+
 pushd src > /dev/null
 . ../options.conf
+. ../versions.txt
 . ../include/color.sh
 . ../include/check_os.sh
 . ../include/download.sh

+ 2 - 2
versions.txt

@@ -48,7 +48,7 @@ zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
 apcu_for_php7_version=5.1.8
-ImageMagick_version=6.9.7-9
+ImageMagick_version=6.9.7-10
 imagick_version=3.4.3
 imagick_for_php53_version=3.3.0
 GraphicsMagick_version=1.3.25
@@ -79,7 +79,7 @@ memcache_pecl_version=3.0.8
 phpMyAdmin_version=4.4.15.10
 
 # jemalloc
-jemalloc_version=4.4.0
+jemalloc_version=4.5.0
 
 # boost
 boost_version=1.59.0