From fb06a3e70faa1931c74ff1599830ad5b1352d8cd Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 13 Feb 2020 14:23:32 +0100
Subject: lib/mysql-functions: remove hard-coded package suffixes

---
 lib/mysql-functions | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

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"
-- 
cgit v1.2.3