summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-13 18:11:07 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-13 18:34:49 +0000
commitaa813ade41c14d39fe93ed564ec9b9563d4c7076 (patch)
tree785730dd76458c2f7a4f33b5f15d27103ef8f05f
parentUpdating. (diff)
downloadprogress-linux-tools-aa813ade41c14d39fe93ed564ec9b9563d4c7076.tar.xz
progress-linux-tools-aa813ade41c14d39fe93ed564ec9b9563d4c7076.zip
Updating.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rwxr-xr-xweb/update21
1 files 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