From aa813ade41c14d39fe93ed564ec9b9563d4c7076 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 13 Dec 2021 19:11:07 +0100 Subject: Updating. Signed-off-by: Daniel Baumann --- web/update | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/web/update b/web/update index 06fa927..e89a207 100755 --- a/web/update +++ b/web/update @@ -131,7 +131,7 @@ Download_upstream_indices () do for ARCHITECTURE in ${ARCHITECTURES} do - echo -n " ." + echo -n "." case "${ARCHITECTURE}" in source) @@ -195,14 +195,8 @@ Download_upstream_indices () Download_downstream_indices Download_upstream_indices - -echo FIXME -exit 1 - - - # Process downstream indices -DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.indices | sort -u)" +DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.sources | sort -u)" echo "################################################################################" echo "${DOWNSTREAM_DISTRIBUTION}" @@ -212,8 +206,15 @@ echo -n "Comparing versions... " for PACKAGE in ${DOWNSTREAM_PACKAGES} do - DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.indices | awk '/^Version: / { print $2 }')" - UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.indices | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" + DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }')" + #UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.indices | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" + + # upstream_source_version = highest version of (upstream_source_versions + upstream_binary_versions) + UPSTREAM_VERSION="$(grep -A2 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | awk '/^Version: / { print $2 }') $(for BINARY in $(grep -A1 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | grep '^Binary:' | cut -d: -f 2- | sed -e 's|,||g'); do grep -A2 "^Package: ${BINARY}\$" upstream.${MODE}.binaries ; done | awk '/^Version: / { print $2 }')" + UPSTREAM_VERSION="$(echo ${UPSTREAM_VERSION} | sed -e 's| |\n|g' | sort -rV | head -n1)" + +# FIXME +#for B in $(grep -A1 '^Package: lzlib$' upstream.fuchur.sources | awk -F: '/^Binary: / { print $2 }' | sed -e 's|,||g'); do grep -A2 "^Package: $B\$" upstream.fuchur.binaries ; done | awk -F: '/^Version: / { print $2 }' | sort -rV | head -n1 if echo ${UPSTREAM_VERSION} | grep -qs '-' then -- cgit v1.2.3