update

plugins/php/versions/52/install.sh

@@ -82,18 +82,11 @@ if [ -f $serverPath/php/${PHP_VER}/bin/php ];then
 	return
 fi
 
-OPTIONS=''
+OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS='--without-iconv'
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
-else
-	OPTIONS='--without-iconv'
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"

plugins/php/versions/53/install.sh

@@ -66,12 +66,7 @@ fi
 # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib"
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
-else
-	# OPTIONS=" --with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/54/install.sh

@@ -59,21 +59,11 @@ fi
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-
-	BREW_DIR=`which brew`
-	BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	CURL_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	OPTIONS="$OPTIONS --with-curl=${CURL_DEPEND_DIR}"
 	# OPTIONS="${OPTIONS} --with-pcre-dir=${serverPath}/lib/pcre"
 	# OPTIONS="${OPTIONS} --with-external-pcre=${serverPath}/lib/pcre"
-
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/55/install.sh

@@ -59,14 +59,9 @@ fi
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/56/install.sh

@@ -63,14 +63,9 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 	OPTIONS="${OPTIONS} --with-zlib-dir=$(brew --prefix zlib)"
-	# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/70/install.sh

@@ -60,12 +60,7 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl"
 	# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/71/install.sh

@@ -61,11 +61,7 @@ OPTIONS=''
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/72/install.sh

@@ -58,13 +58,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 fi
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
+OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
-	OPTIONS="${OPTIONS} --with-curl"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then

plugins/php/versions/73/install.sh

@@ -75,7 +75,6 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 	OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
 else
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
 	OPTIONS="${OPTIONS} ${ZIP_OPTION}"
 	OPTIONS="${OPTIONS} --with-readline"

plugins/php/versions/74/install.sh

@@ -80,19 +80,7 @@ cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-
-	# BREW_DIR=`which brew`
-	# BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	# XML_LIB_DEPEND_DIR=`brew info libxml2 | grep /opt/homebrew/Cellar/libxml2 | cut -d \  -f 1 | awk 'END {print}'`
-	# XML_LIB_DEPEND_DIR=`brew info libxml2 | grep ${BREW_DIR}/Cellar/libxml2 | cut -d \  -f 1 | awk 'END {print}'`
-	# OPTIONS="${OPTIONS} --with-libxml=${XML_LIB_DEPEND_DIR}"
-
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/80/install.sh

@@ -71,13 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
+
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

plugins/php/versions/81/install.sh

@@ -71,12 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
+# if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
+# 	OPTIONS="${OPTIONS} --with-curl"
-else
+# fi
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then

plugins/php/versions/82/install.sh

@@ -72,15 +72,12 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
+# if [ $sysName == 'Darwin' ]; then
-	BREW_DIR=`which brew`
+# 	BREW_DIR=`which brew`
-	BREW_DIR=${BREW_DIR/\/bin\/brew/}
+# 	BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
+# 	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
+# 	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
-else
+# fi
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then

plugins/php/versions/83/install.sh

@@ -71,16 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
+# if [ $sysName == 'Darwin' ]; then
-	# BREW_DIR=`which brew`
+# 	OPTIONS="${OPTIONS} --with-curl"
-	# BREW_DIR=${BREW_DIR/\/bin\/brew/}
+# fi
-	# LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	# OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
-	echo "curl"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then

plugins/php/versions/84/install.sh

@@ -56,13 +56,10 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
+
-	# OPTIONS="${OPTIONS} --with-curl"
+# if [ $sysName == 'Darwin' ]; then
-	echo "curl pass"
+# 	OPTIONS="${OPTIONS} --with-curl"
-else
+# fi
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then

plugins/php/versions/phplib.conf

@@ -419,6 +419,30 @@
         "shell": "intl.sh",
         "check": "intl.so"
     },
+    {
+        "name": "readline",
+        "versions": [
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "通用扩展",
+        "msg": "命令行的支持",
+        "shell": "readline.sh",
+        "check": "readline.so"
+    },
     {
         "name": "memcache",
         "versions": [