diff --git a/README.md b/README.md index e50ac1ab..86a8c6e1 100644 --- a/README.md +++ b/README.md @@ -876,7 +876,6 @@ Examples of using `setup-php` with various PHP Frameworks and Packages. - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies") - [aaronparker/VcRedist](https://github.com/aaronparker/VcRedist "VcRedist PowerShell package") -- [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions") - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows") - [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages") - [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions") diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 073c824c..7f981e80 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -13,7 +13,6 @@ cleanup_lists() { sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save sudo mkdir /etc/apt/sources.list.d sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/ - sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit fi } @@ -117,9 +116,7 @@ add_extension() { if check_extension "$extension"; then add_log "${tick:?}" "$extension" "Enabled" else - if [[ "$version" =~ 5.[4-5] ]]; then - install_packages "php5-$extension=$release_version" - elif [[ "$version" =~ ${nightly_versions:?} ]]; then + if [[ "$version" =~ ${nightly_versions:?} ]]; then pecl_install "$extension" else install_packages "php$version-$extension" || pecl_install "$extension" @@ -169,7 +166,6 @@ setup_nightly() { # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5. setup_old_versions() { run_script "php5-ubuntu" "$version" - release_version=$(php -v | head -n 1 | cut -d' ' -f 2) } # Function to add PECL.