4 Commits
1.8.0 ... 1.8.1

Author SHA1 Message Date
Shivam Mathur
58311d5340 Fix regex in check for valid package names 2022-08-30 14:36:45 +05:30
Shivam Mathur
55034917ed Use dpkg --print-architecture 2022-08-30 14:27:37 +05:30
github-actions[bot]
114c7bf40c Updating lists 2022-08-30 08:39:14 +00:00
Shivam Mathur
567dc865bb Add check for valid package names 2022-08-30 13:38:54 +05:30
2 changed files with 5 additions and 2 deletions

View File

@@ -510,6 +510,8 @@ libnuma1
libobjc-11-dev libobjc-11-dev
libobjc4 libobjc4
libodbc2 libodbc2
libodbccr2
libodbcinst2
libonig5 libonig5
libopenexr-dev libopenexr-dev
libopenexr25 libopenexr25

View File

@@ -7,8 +7,8 @@ link_apt_fast() {
fetch_package() { fetch_package() {
if ! [ -e /tmp/Packages ]; then if ! [ -e /tmp/Packages ]; then
. /etc/os-release . /etc/os-release
deb_build_arch=$(dpkg-architecture -q DEB_BUILD_ARCH) arch=$(dpkg --print-architecture)
curl -o /tmp/Packages.gz -sL "http://ppa.launchpad.net/ondrej/php/ubuntu/dists/$VERSION_CODENAME/main/binary-$deb_build_arch/Packages.gz" curl -o /tmp/Packages.gz -sL "http://ppa.launchpad.net/ondrej/php/ubuntu/dists/$VERSION_CODENAME/main/binary-$arch/Packages.gz"
gzip -df /tmp/Packages.gz gzip -df /tmp/Packages.gz
fi fi
} }
@@ -98,6 +98,7 @@ setup_dependencies() {
libraries="" libraries=""
extension_packages="" extension_packages=""
for extension_package in "${extensions_array[@]}"; do for extension_package in "${extensions_array[@]}"; do
[[ ! "$extension_package" =~ php[0-9]+\.[0-9]+-[a-zA-Z]+$ ]] && continue
fetch_package fetch_package
libraries="$libraries $(get_dependencies "$extension_package" "lib")" libraries="$libraries $(get_dependencies "$extension_package" "lib")"
IFS=' ' read -r -a dependency_extension_packages_array <<<"$(get_dependencies "$extension_package" "php$version-")" IFS=' ' read -r -a dependency_extension_packages_array <<<"$(get_dependencies "$extension_package" "php$version-")"