From 7cce6998e4466390baeff8e8f5568ebbd6b606d0 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 13 Feb 2020 14:26:35 +0100 Subject: lib/common-functions: remove hard-coded package suffixes --- lib/common-functions | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/common-functions b/lib/common-functions index e7e44b9..7bf7897 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -9,8 +9,6 @@ if [ -z "${base_dir}" ]; then . '../lib/load-configuration' fi -# TODO: remove hard-coded package suffixes - # find_pkgbuilds package repository git_repository git_revision mod_git_revision # find the PKGBUILD and modification of $package from $repository # sets $PKGBUILD and $PKGBUILD_mod @@ -758,10 +756,7 @@ trigger_mirror_refreshs() { # extract_pkgname_epoch_pkgver_pkgrel_sub_pkgrel_arch_from_package_name extract_pkgname_epoch_pkgver_pkgrel_sub_pkgrel_arch_from_package_name() { pkgname="$1" - pkgname="${pkgname%.pkg.tar.xz}" - if [ "${pkgname}" = "$1" ]; then - pkgname="${pkgname%.pkg.tar.zst}" - fi + pkgname="${pkgname%.pkg.tar*}" arch="${pkgname##*-}" pkgname="${pkgname%-*}" sub_pkgrel="${pkgname##*-}" -- cgit v1.2.3