diff options
| author | Erich Eckner <git@eckner.net> | 2018-09-14 11:04:22 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-09-14 11:04:22 +0200 |
| commit | dc6a8a45cac8d947863ec8508aaba07315e24c8c (patch) | |
| tree | eeb431b4dd4e7b29ef78a21ecc0829b0787d5229 /bin | |
| parent | b4a3d61b3f51cbdf5af23002ede2fbf08cd9f3a9 (diff) | |
| download | builder-dc6a8a45cac8d947863ec8508aaba07315e24c8c.tar.xz | |
bin/seed-build-list: fix sed logic
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/seed-build-list | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/seed-build-list b/bin/seed-build-list index 2cabe38..75e450d 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -177,7 +177,9 @@ if [ -s "${tmp_dir}/mirrors" ]; then N s/^.*\n// /^lib32-/d - s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i686\2\n\1i486\2/ + s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/ + ' | \ + sed ' s/^\(.*\)-\([^-]\+-[^-]\+\)-\([^-]\+\)$/theirs \2 \3 \1/ ' done @@ -217,6 +219,9 @@ if [ -s "${tmp_dir}/mirrors" ]; then "${tmp_dir}/pkgnames" fi +grep -HF '' "${tmp_dir}/pkgbases" "${tmp_dir}/pkgnames" +exit 4 + # harvest pkgnames from undelete-mirrors if [ -s "${tmp_dir}/undelete-mirrors" ]; then while read -r mirror; do @@ -230,8 +235,10 @@ if [ -s "${tmp_dir}/undelete-mirrors" ]; then /^%FILENAME%$/!d N s/^.*\n// - s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i686\2\n\1i486\2/ /^lib32-/d + s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/ + ' | \ + sed ' s/^\(.*\)\(-[^-]\+\)\{3\}$/\1/ ' done |