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

Improve support for deb822 system sources file

Browse Source
This commit is contained in:
Shivam Mathur 2024-04-27 21:04:56 +05:30
parent 18975ec414
commit 868f02c3ff
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scripts/tools/ppa.sh
View File

@ -55,7 +55,7 @@ update_lists() {
if [[ -n "$ppa" && -n "$ppa_search" ]]; then if [[ -n "$ppa" && -n "$ppa_search" ]]; then
list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")" list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")"
status_file=/tmp/"${ppa/\//_}" status_file=/tmp/"${ppa/\//_}"
elif [ -e "$list_file" ] && grep -Eq '^deb ' "$list_file"; then elif [ -e "$list_file" ] && grep -Eq '^deb |^Types deb' "$list_file"; then
list="$list_file" list="$list_file"
fi fi
if [ ! -e "$status_file" ]; then if [ ! -e "$status_file" ]; then
@ -189,8 +189,9 @@ update_ppa() {
} }
# Variables # Variables
list_file='/etc/apt/sources.list' list_dir='/etc/apt/sources.list.d'
list_dir="$list_file.d" list_file="/etc/apt/sources.list.d/$ID.sources"
[ -e "$list_file" ] || list_file='/etc/apt/sources.list'
upstream_lsb='/etc/upstream-release/lsb-release' upstream_lsb='/etc/upstream-release/lsb-release'
lp_api='https://api.launchpad.net/1.0' lp_api='https://api.launchpad.net/1.0'
lp_ppa='http://ppa.launchpad.net' lp_ppa='http://ppa.launchpad.net'