diff options
| author | Erich Eckner <git@eckner.net> | 2020-02-13 14:23:32 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-02-13 14:23:32 +0100 |
| commit | fb06a3e70faa1931c74ff1599830ad5b1352d8cd (patch) | |
| tree | bfb46d5c4aeae849f151f5c9e7492948d6e76fdd /lib/mysql-functions | |
| parent | dfb3538e3048089b45cd7acf3203199bff9949eb (diff) | |
| download | builder-fb06a3e70faa1931c74ff1599830ad5b1352d8cd.tar.xz | |
lib/mysql-functions: remove hard-coded package suffixes
Diffstat (limited to 'lib/mysql-functions')
| -rwxr-xr-x | lib/mysql-functions | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions index 3932f87..cd35df4 100755 --- a/lib/mysql-functions +++ b/lib/mysql-functions @@ -4,8 +4,6 @@ # shellcheck disable=SC2016,SC2039,SC2119,SC2120 -# TODO: remove hard-coded package suffixes - if [ -z "${base_dir}" ]; then # just to make shellcheck happy . '../lib/load-configuration' @@ -724,7 +722,7 @@ mysql_sanity_check() { for dir in $(ls_master_mirror "${arch}"); do ls_master_mirror "${arch}/${dir}" | \ sed ' - /\.pkg\.tar\.\(xz\|zst\)$/!d + /\.pkg\.\('"${package_compression_suffix_regex}"'\)$/!d s|^|'"${arch}"'/'"${dir}"'/| ' done @@ -764,7 +762,7 @@ mysql_sanity_check() { # shellcheck disable=SC2041 ls_master_mirror 'pool' | \ sed ' - /\.pkg\.tar\.\(xz\|zst\)\(\.sig\)\?$/ !d + /\.pkg\.\('"${package_compression_suffix_regex}"'\)\(\.sig\)\?$/ !d ' | \ sort -u > \ "${temp_dir}/master-mirror-pool" |