diff options
| author | Erich Eckner <git@eckner.net> | 2020-02-13 14:26:35 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-02-13 14:26:35 +0100 |
| commit | 7cce6998e4466390baeff8e8f5568ebbd6b606d0 (patch) | |
| tree | 8f5a886b6cd8e856a69bfffa70609cf89cbd9286 /lib | |
| parent | fb06a3e70faa1931c74ff1599830ad5b1352d8cd (diff) | |
| download | builder-7cce6998e4466390baeff8e8f5568ebbd6b606d0.tar.xz | |
lib/common-functions: remove hard-coded package suffixes
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/common-functions | 7 |
1 files changed, 1 insertions, 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##*-}" |