diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-04-06 17:25:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-05-09 11:03:46 -0400 |
| commit | 7b60146b461edb26db508ed0f8dded4d16479546 (patch) | |
| tree | 09ad2c27bc8471d164d14c8375b9e584317e31f9 /db-import-pkg | |
| parent | 456762ff502db415fa6218afbc00eabf7bcff2a4 (diff) | |
Rename config:PKGEXT -> config:PKGEXTS
Exclude the test suite from this.
Do a search/replace, excluding test/:
git grep -l 'PKGEXT\b' ':!test' | xargs -r sed -i 's/PKGEXT\b/PKGEXTS/g' --
Then move test/lib/common.bash's PKGEXT= up in setup(), since ". config"
will no longer override it.
Diffstat (limited to 'db-import-pkg')
| -rwxr-xr-x | db-import-pkg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db-import-pkg b/db-import-pkg index d61f348..ed1c7a5 100755 --- a/db-import-pkg +++ b/db-import-pkg @@ -72,11 +72,11 @@ filter_blacklisted() { # parabolaweb, librechroot, and who-knows-what-else. This only # filters exact pkgname/epoch/pkgver/pkgrel matches. filter_duplicates() { - # FIXME: this will need to be adjusted when we turn PKGEXT in + # FIXME: this will need to be adjusted when we turn PKGEXTS in # to an extglob. sort -u | comm -23 \ - \ - <(find "${FTP_BASE}/pool/" -name "*-any${PKGEXT}" -printf "%f\n" | + <(find "${FTP_BASE}/pool/" -name "*-any${PKGEXTS}" -printf "%f\n" | sed 's/-any\.pkg.*//' | sed -r 's/-([^-]*-[^-]*)$/ \1/' | sort -u) @@ -202,7 +202,7 @@ make_repo_dbs() { pushd "${from}" local -r pkgfiles - pkgfiles=($(sed -e "s|\$|${PKGEXT}|" "$whitelist")) + pkgfiles=($(sed -e "s|\$|${PKGEXTS}|" "$whitelist")) local -r UMASK=$(umask) umask 002 repo-add "${db_file##*/}" "${pkgfiles[@]}" |