Fixing mcrypt install

Author: moufmouf

extensions/core/docker-install.sh

@@ -35,13 +35,13 @@ if [ -n "$PECL_EXTENSION" ]; then
       apt-get install -y --no-install-recommends build-essential php-pear php${PHP_VERSION}-dev pkg-config
       curl https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -L -o /usr/local/bin/pickle
       chmod +x /usr/local/bin/pickle
-      which pickle
-      php -v
-      php /usr/local/bin/pickle -v
-      pickle -v
     fi
 
-    pickle install $PECL_EXTENSION
+    if [ -n "$USE_PECL" ]; then
+      pecl install $PECL_EXTENSION
+    else
+      pickle install $PECL_EXTENSION
+    fi
     echo "extension=${PHP_EXT_NAME:-${PECL_EXTENSION}}.so" > /etc/php/${PHP_VERSION}/mods-available/${PHP_EXT_NAME:-${PECL_EXTENSION}}.ini
     # Adding this in the list of Ubuntu extensions because we use that list as a base for the modules list.
     # TODO: question: cannot we use /etc/php/mods-available instead???

extensions/core/mcrypt/install.sh

@@ -3,6 +3,7 @@
 set -e
 # Comments: MCrypt is deprecated and usage is generally discouraged. Provided here for legacy apps only.
 
+export USE_PECL=1
 export PECL_EXTENSION=mcrypt-1.0.1
 export PHP_EXT_NAME=mcrypt # name of the extension (to put in PHP_EXTENSIONS variable)
 export DEV_DEPENDENCIES="libmcrypt-dev"

extensions/core/mysqli/install.sh

@@ -6,6 +6,6 @@ export PACKAGE_NAME=mysql
 
 ../docker-install.sh
 
-# Exception for this package that enables both mysql nd and mysqli
+# Exception for this package that enables both mysqlnd and mysqli and pdo_mysql
 phpdismod mysqli
 phpdismod pdo_mysql