cleanup: add common implementation of check_update

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>

pkg/bash/build

@@ -26,7 +26,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">bash-[0-9.]*tar.gz<" | \
-	    sed 's/>bash-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "bash-" "tar.gz"
 }

pkg/bbstatic/build

@@ -30,8 +30,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | \
-	    grep -o ">busybox-[0-9.]*tar.bz2<" | \
-	    sed 's/>busybox-//g' | sed 's/.tar.bz2<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "busybox-" "tar.bz2"
 }

pkg/btrfs-progs/build

@@ -25,8 +25,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | \
-	    grep -o ">btrfs-progs-v[0-9.]*tar.xz<" | \
-	    sed 's/>btrfs-progs-v//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "btrfs-progs-v" "tar.xz"
 }

pkg/coreutils/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">coreutils-[0-9.]*tar.xz<" | \
-	    sed 's/>coreutils-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "coreutils-" "tar.xz"
 }

pkg/dhcpcd/build

@@ -27,7 +27,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">dhcpcd-[0-9.]*tar.xz<" | \
-	    sed 's/>dhcpcd-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "dhcpcd-" "tar.xz"
 }

pkg/diffutils/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">diffutils-[0-9.]*tar.xz<" | \
-	    sed 's/>diffutils-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "diffutils-" "tar.xz"
 }

pkg/dnsmasq/build

@@ -34,7 +34,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">dnsmasq-[0-9.]*tar.xz<" | \
-	    sed 's/>dnsmasq-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "dnsmasq-" "tar.xz"
 }

pkg/dosfstools/build

@@ -20,8 +20,7 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "https://github.com/dosfstools/dosfstools/releases" |\
-	    grep -o "dosfstools-[0-9.]*tar.xz" | \
-	    sed 's/dosfstools-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple \
+		"https://github.com/dosfstools/dosfstools/releases" \
+		"dosfstools-" "tar.xz"
 }

pkg/ethtool/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o "ethtool-[0-9.]*tar.xz" | \
-	    sed 's/ethtool-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "ethtool-" "tar.xz"
 }

pkg/findutils/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">findutils-[0-9.]*tar.gz<" | \
-	    sed 's/>findutils-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "findutils-" "tar.gz"
 }

pkg/gawk/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">gawk-[0-9.]*tar.xz<" | \
-	    sed 's/>gawk-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "gawk-" "tar.xz"
 }

pkg/gmp/build

@@ -21,9 +21,6 @@ deploy() {
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
-
 check_update() {
-	curl --silent -L "$URL" | grep -o ">gmp-[0-9.]*tar.bz2<" | \
-	    sed 's/>gmp-//g' | sed 's/.tar.bz2<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "gmp-" "tar.bz2"
 }

pkg/grep/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">grep-[0-9.]*tar.xz<" | \
-	    sed 's/>grep-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "grep-" "tar.xz"
 }

pkg/gzip/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">gzip-[0-9.]*tar.xz<" | \
-	    sed 's/>gzip-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "gzip-" "tar.xz"
 }

pkg/hostapd/build

@@ -36,7 +36,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">hostapd-[0-9.]*tar.gz<" | \
-	    sed 's/>hostapd-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "hostapd-" "tar.gz"
 }

pkg/inetutils/build

@@ -24,7 +24,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">inetutils-[0-9.]*tar.xz<" | \
-	    sed 's/>inetutils-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "inetutils-" "tar.xz"
 }

pkg/iproute2/build

@@ -32,7 +32,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o "iproute2-[0-9.]*tar.xz" | \
-	    sed 's/iproute2-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "iproute2-" "tar.xz"
 }

pkg/iw/build

@@ -36,7 +36,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o "iw-[0-9.]*tar.xz" | \
-	    sed 's/iw-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "iw-" "tar.xz"
 }

pkg/kbd/build

@@ -22,7 +22,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">kbd-[0-9.]*tar.xz<" | \
-	    sed 's/>kbd-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "kbd-" "tar.xz"
 }

pkg/kmod/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">kmod-[0-9.]*tar.xz<" | \
-	    sed 's/>kmod-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "kmod-" "tar.xz"
 }

pkg/ldns/build

@@ -23,7 +23,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o "ldns-[0-9.]*tar.gz" | \
-	    sed 's/ldns-//g' | sed 's/.tar.gz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "ldns-" "tar.gz"
 }

pkg/less/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">less-[0-9.]*tar.gz<" | \
-	    sed 's/>less-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "less-" "tar.gz"
 }

pkg/libbsd/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">libbsd-[0-9.]*tar.xz<" | \
-	    sed 's/>libbsd-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "libbsd-" "tar.xz"
 }

pkg/libmnl/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">libmnl-[0-9.]*tar.bz2<" | \
-	    sed 's/>libmnl-//g' | sed 's/.tar.bz2<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "libmnl-" "tar.bz2"
 }

pkg/libnftnl/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">libnftnl-[0-9.]*tar.bz2<" | \
-	    sed 's/>libnftnl-//g' | sed 's/.tar.bz2<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "libnftnl-" "tar.bz2"
 }

pkg/libnl3/build

@@ -22,7 +22,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">libnl-[0-9.]*tar.gz<" | \
-	    sed 's/>libnl-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "libnl-" "tar.gz"
 }

pkg/libpcap/build

@@ -24,7 +24,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">libpcap-[0-9.]*tar.gz<" | \
-	    sed 's/>libpcap-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "libpcap-" "tar.gz"
 }

pkg/libseccomp/build

@@ -19,7 +19,6 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L https://github.com/seccomp/libseccomp/releases | \
-	    grep -o "libseccomp-[0-9.]*tar.gz" | sed 's/libseccomp-//g' | \
-	    sed 's/.tar.gz//g' | verson_find_greatest "$VERSION"
+	check_update_simple "https://github.com/seccomp/libseccomp/releases" \
+			    "libseccomp-" "tar.gz"
 }

pkg/lzo/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">lzo-[0-9.]*tar.gz<" | \
-	    sed 's/>lzo-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "lzo-" "tar.gz"
 }

pkg/musl/build

@@ -68,7 +68,5 @@ _EOF
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">musl-[0-9.]*tar.gz<" | \
-	    sed 's/>musl-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "musl-" "tar.gz"
 }

pkg/nano/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">nano-[0-9.]*tar.xz<" | \
-	    sed 's/>nano-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "nano-" "tar.xz"
 }

pkg/ncurses/build

@@ -27,7 +27,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">ncurses-[0-9.]*tar.gz<" | \
-	    sed 's/>ncurses-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "ncurses-" "tar.gz"
 }

pkg/nginx/build

@@ -101,7 +101,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">nginx-[0-9.]*tar.gz<" | \
-	    sed 's/>nginx-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "nginx-" "tar.gz"
 }

pkg/pcre/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">pcre-[0-9.]*tar.bz2<" | \
-	    sed 's/>pcre-//g' | sed 's/.tar.bz2<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "pcre-" "tar.bz2"
 }

pkg/procps-ng/build

@@ -23,7 +23,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">procps-ng-[0-9.]*tar.xz<" | \
-	    sed 's/>procps-ng-//g' | sed 's/.tar.xz<//g' |\
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "procps-ng-" "tar.xz"
 }

pkg/psmisc/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o ">psmisc-[0-9.]*tar.xz<" | \
-	    sed 's/>psmisc-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "psmisc-" "tar.xz"
 }

pkg/readline/build

@@ -22,7 +22,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o ">readline-[0-9.]*tar.gz<" | \
-	    sed 's/>readline-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "readline-" "tar.gz"
 }

pkg/sed/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o ">sed-[0-9.]*tar.xz<" | \
-	    sed 's/>sed-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "sed-" "tar.xz"
 }

pkg/shadow/build

@@ -29,8 +29,6 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L https://github.com/shadow-maint/shadow/releases | \
-	    grep -o "shadow-[0-9.]*tar.xz" | \
-	    sed 's/shadow-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "https://github.com/shadow-maint/shadow/releases" \
+			    "shadow-" "tar.xz"
 }

pkg/tar/build

@@ -20,7 +20,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L $URL | grep -o ">tar-[0-9.]*tar.xz<" | \
-	    sed 's/>tar-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "tar-" "tar.xz"
 }

pkg/tc-binutils/build

@@ -49,7 +49,5 @@ _EOF
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">binutils-[0-9.]*tar.xz<" | \
-	    sed 's/>binutils-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "binutils-" "tar.xz"
 }

pkg/tc-mpc/build

@@ -19,7 +19,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">mpc-[0-9.]*tar.gz<" | \
-	    sed 's/>mpc-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "mpc-" "tar.gz"
 }

pkg/tc-mpfr/build

@@ -19,7 +19,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">mpfr-[0-9.]*tar.xz<" | \
-	    sed 's/>mpfr-//g' | sed 's/.tar.xz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "mpfr-" "tar.xz"
 }

pkg/tc-pkg-config/build

@@ -31,7 +31,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">pkg-config-[0-9.]*tar.gz<" | \
-	    sed 's/>pkg-config-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "pkg-config-" "tar.gz"
 }

pkg/tcpdump/build

@@ -22,7 +22,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">tcpdump-[0-9.]*tar.gz<" | \
-	    sed 's/>tcpdump-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "tcpdump-" "tar.gz"
 }

pkg/unbound/build

@@ -42,7 +42,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o ">unbound-[0-9.]*tar.gz<" | \
-	    sed 's/>unbound-//g' | sed 's/.tar.gz<//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "unbound-" "tar.gz"
 }

pkg/xz/build

@@ -21,7 +21,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o "xz-[0-9.]*tar.xz" | \
-	    sed 's/xz-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "xz-" "tar.xz"
 }

pkg/zlib/build

@@ -32,7 +32,5 @@ deploy() {
 }
 
 check_update() {
-	curl --silent -L "$URL" | grep -o "xz-[0-9.]*tar.xz" | \
-	    sed 's/zlib-//g' | sed 's/.tar.xz//g' | \
-	    verson_find_greatest "$VERSION"
+	check_update_simple "$URL" "zlib-" "tar.xz"
 }

util/version.sh

@@ -31,3 +31,13 @@ verson_find_greatest() {
 		echo "$found"
 	fi
 }
+
+check_update_simple() {
+	local url="$1"
+	local prefix="$2"
+	local suffix="$3"
+
+	curl --silent -L "$url" | grep -o ">$prefix-[0-9.]*$suffix<" | \
+	    sed 's/>$prefix-//g' | sed 's/.$suffix<//g' | \
+	    verson_find_greatest "$VERSION"
+}