actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-23 04:11:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix logs

Browse Source
This commit is contained in:
Shivam Mathur 2020-07-20 20:57:09 +05:30
parent 1870ffc08c
commit 33a005dd90
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scripts/linux.sh
View File

@ -19,9 +19,9 @@ add_log() {
# Function to backup and cleanup package lists. # Function to backup and cleanup package lists.
cleanup_lists() { cleanup_lists() {
if [ ! -e /etc/apt/sources.list.d.save ]; then if [ ! -e /etc/apt/sources.list.d.save ]; then
sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save || true
sudo mkdir /etc/apt/sources.list.d 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/*ondrej*.list /etc/apt/sources.list.d/ || true
trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit
fi fi
} }
@ -29,7 +29,7 @@ cleanup_lists() {
# Function to update php ppa # Function to update php ppa
update_lists() { update_lists() {
if [ "$lists_updated" = "false" ]; then if [ "$lists_updated" = "false" ]; then
cleanup_lists cleanup_lists >/dev/null 2>&1
sudo "$debconf_fix" apt-get update >/dev/null 2>&1 sudo "$debconf_fix" apt-get update >/dev/null 2>&1
fi fi
} }
@ -267,8 +267,8 @@ sudo mkdir -p /var/run /run/php
. /etc/lsb-release . /etc/lsb-release
if [ "$DISTRIB_RELEASE" = "20.04" ]; then if [ "$DISTRIB_RELEASE" = "20.04" ]; then
if ! apt-cache policy | grep -q ondrej/php; then if ! apt-cache policy | grep -q ondrej/php; then
cleanup_lists cleanup_lists >/dev/null 2>&1
LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y >/dev/null 2>&1
fi fi
fi fi
@ -279,7 +279,7 @@ if [ "$existing_version" != "$version" ]; then
else else
update_lists update_lists
IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")" IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
$apt_install "${packages[@]}" $apt_install "${packages[@]}" >/dev/null 2>&1
fi fi
status="Installed" status="Installed"
else else