From a36c26d5a83852a9c792fbb121a889699694cc9d Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 13 Feb 2020 09:32:09 +0100 Subject: checkVersions: fix program flow --- checkVersions | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'checkVersions') diff --git a/checkVersions b/checkVersions index dad60cee..25bcd9cb 100755 --- a/checkVersions +++ b/checkVersions @@ -213,7 +213,19 @@ then eval "$( grep '^pkg\(base\|name\|ver\)=' $1/PKGBUILD )" - source=(dummy) + remVer=$( + find '/mnt/archlinux32' -regextype sed \ + -type f \ + -regex '.*/'"${1%32}"'-[^-]\+-[^-]\+-any\.pkg\.tar\.\(xz\|zst\)' \ + -printf '%f\n' | \ + sed ' + s/-[^-]\+-[^-]\+$// + s/^.*-// + ' | \ + latest_version + ) + srcKnown=true + source=() fi if [ -n "${pkgbase}" ]; then pkgname="${pkgbase}" @@ -221,23 +233,6 @@ then for src in "${source[@]}" "${source_i686[@]}" "${source_x86_64[@]}" do - - if ! ${archlinuxewe}; then - remVer=$( - find '/mnt/archlinux32' -regextype sed \ - -type f \ - -regex '.*/'"${1%32}"'-[^-]\+-[^-]\+-any\.pkg\.tar\.\(xz\|zst\)' \ - -printf '%f\n' | \ - sed ' - s/-[^-]\+-[^-]\+$// - s/^.*-// - ' | \ - latest_version - ) - srcKnown=true - continue - fi - src_name="${src%%::*}" src="${src#*::}" -- cgit v1.2.3-54-g00ecf