Browse Source

Update versions.txt

lj2007331@gmail.com 7 years ago
parent
commit
273afe408a
3 changed files with 6 additions and 6 deletions
  1. 2 2
      include/php-7.2.sh
  2. 1 1
      install.sh
  3. 3 3
      versions.txt

+ 2 - 2
include/php-7.2.sh

@@ -54,7 +54,7 @@ Install_PHP72() {
     --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
     --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --enable-inline-optimization --with-curl=/usr/local --enable-mbregex \
-    --enable-mbstring --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
+    --enable-mbstring --with-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
   else
@@ -65,7 +65,7 @@ Install_PHP72() {
     --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
     --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --enable-inline-optimization --with-curl=/usr/local --enable-mbregex \
-    --enable-mbstring --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
+    --enable-mbstring --with-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
   fi

+ 1 - 1
install.sh

@@ -173,7 +173,7 @@ while :; do echo
     echo "${CWARNING}input error! Please only input 'y' or 'n'${CEND}"
   else
     if [ "$DB_yn" == 'y' ]; then
-      [ -d "$db_install_dir/support-files" -a -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}Database already installed! ${CEND}"; DB_yn=Other; break; }
+      [ -d "$db_install_dir/support-files" -a -e "${pgsql_install_dir}/bin/psql" -a -e "${mongo_install_dir}/bin/mongo" ] && { echo "${CWARNING}Database already installed! ${CEND}"; DB_yn=Other; break; }
       while :; do echo
         echo 'Please select a version of the Database:'
         echo -e "\t${CMSG} 1${CEND}. Install MySQL-5.7"

+ 3 - 3
versions.txt

@@ -21,12 +21,12 @@ mysql57_version=5.7.20
 mysql56_version=5.6.38
 mysql55_version=5.5.58
 
-mariadb102_version=10.2.11
+mariadb102_version=10.2.12
 mariadb101_version=10.1.30
 mariadb100_version=10.0.33
 mariadb55_version=5.5.58
 
-percona57_version=5.7.20-18
+percona57_version=5.7.20-19
 percona56_version=5.6.38-83.0
 percona55_version=5.5.58-38.10
 
@@ -55,7 +55,7 @@ curl_version=7.57.0
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
-ImageMagick_version=6.9.9-31
+ImageMagick_version=6.9.9-33
 imagick_version=3.4.3
 GraphicsMagick_version=1.3.26
 gmagick_for_php7_version=2.0.4RC1