Skip to content

Commit a358b6c

Browse files
committed
Install PEAR on master
1 parent bb29bb9 commit a358b6c

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

bin/compile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
# Function currently not used, kept around in case we need to fetch a specific version due
4+
# to an upstream packaging issues.
35
function fetch_pear() {
46
set +o errexit
57
local tries max_tries
@@ -62,19 +64,15 @@ pushd "${INSTALL_DEST}/${VERSION}"
6264
sudo mkdir -p /usr/local/ssl
6365
sudo wget -O /usr/local/ssl/cert.pem https://curl.haxx.se/ca/cacert.pem
6466

65-
# don't install pear on master or snapshots (issue with php 8.0)
66-
# this could be a temp issue though
67-
if [[ ! $VERSION =~ ^master$ || $VERSION =~ snapshot$ ]]; then
68-
# pear
69-
fetch_pear ${PEAR_VERSION:-'v1.10.12'}
67+
# Fetch latest PEAR phar
68+
curl -fsSL --retry 20 -O http://pear.php.net/go-pear.phar
7069

71-
env TZ=UTC $TRAVIS_BUILD_DIR/bin/install-pear
72-
rm go-pear.phar
73-
"$INSTALL_DEST/$VERSION/bin/pear" config-set php_ini "$INSTALL_DEST/$VERSION/etc/php.ini" system
74-
"$INSTALL_DEST/$VERSION/bin/pear" config-set auto_discover 1
70+
env TZ=UTC $TRAVIS_BUILD_DIR/bin/install-pear
71+
rm go-pear.phar
72+
"$INSTALL_DEST/$VERSION/bin/pear" config-set php_ini "$INSTALL_DEST/$VERSION/etc/php.ini" system
73+
"$INSTALL_DEST/$VERSION/bin/pear" config-set auto_discover 1
7574

76-
"$INSTALL_DEST/$VERSION/bin/pear" channel-update pear.php.net
77-
fi
75+
"$INSTALL_DEST/$VERSION/bin/pear" channel-update pear.php.net
7876

7977
# php-fpm
8078
ln -sv $PWD/sbin/php-fpm $PWD/bin/php-fpm

0 commit comments

Comments
 (0)