Updating.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 29 insertions, 41 deletions

diff --git a/web/ignore.txt b/web/ignore.txt
index 043810b..e69de29 100644
--- a/web/ignore.txt
+++ b/web/ignore.txt
@@ -1,14 +0,0 @@
-# progress-linux
-cryptsetup 2:2.3.4-1+exp1
-e2fsprogs 1.46~WIP.2019.10.03-1
-icu 68.1-1
-libgit2 1.0.1+dfsg.1-1
-libreoffice 1:7.1.0~alpha1-1
-openssl 3.0.0~~alpha4-1
-
-# obsolete
-llvm-toolchain-8 1:8.0.1-10~progress5+u1
-tty-server 0.0~git20201105.50b9367+ds-1~progress5+u1
-
-# bfh
-octave 6.0.90-1
diff --git a/web/update b/web/update
index 20758ae..ca5910d 100755
--- a/web/update
+++ b/web/update
@@ -78,34 +78,36 @@ UPSTREAM_MIRROR="http://debian.ethz.ch/debian"
 
 DOWNSTREAM_SECTIONS="main contrib non-free"
 
-Download_downstream_sources ()
+ARCHITECTURES="amd64 armel armhf arm64 i386 source"
+
+Download_downstream_indices ()
 {
-	# Download downstream sources
-#	if [ -e "downstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y downstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ]
+	# Download downstream indices
+#	if [ -e "downstream.${MODE}.indices" ] && [ "$(( $(stat -c %Y downstream.${MODE}.indices) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ]
 #	then
 #		# file is older than 4 hours
-		rm -f "downstream.${MODE}.sources"
+		rm -f "downstream.${MODE}.indices"
 #	fi
 
-	if [ ! -e "downstream.${MODE}.sources" ]
+	if [ ! -e "downstream.${MODE}.indices" ]
 	then
 		for SECTION in ${DOWNSTREAM_SECTIONS}
 		do
-			wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DOWNSTREAM_DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.sources"
+			wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DOWNSTREAM_DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.indices"
 		done
 	fi
 }
 
-Download_upstream_sources ()
+Download_upstream_indices ()
 {
-	# Download upstream sources
-	if [ -e "upstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y upstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ]
-	then
-		# file is older than 4 hours
-		rm -f "upstream.${MODE}.sources"
-	fi
+	# Download upstream indices
+#	if [ -e "upstream.${MODE}.indices" ] && [ "$(( $(stat -c %Y upstream.${MODE}.indices) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ]
+#	then
+#		# file is older than 4 hours
+		rm -f "upstream.${MODE}.indices"
+#	fi
 
-	if [ ! -e "upstream.${MODE}.sources" ]
+	if [ ! -e "upstream.${MODE}.indices" ]
 	then
 		for DISTRIBUTION in ${UPSTREAM_DISTRIBUTIONS}
 		do
@@ -118,7 +120,7 @@ Download_upstream_sources ()
 					then
 						for SECTION in ${UPSTREAM_SECTIONS}
 						do
-							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices"
 						done
 					fi
 
@@ -126,7 +128,7 @@ Download_upstream_sources ()
 					then
 						for SECTION in ${UPSTREAM_SECTIONS}
 						do
-							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices"
 						done
 					fi
 					;;
@@ -134,17 +136,17 @@ Download_upstream_sources ()
 
 			for SECTION in ${UPSTREAM_SECTIONS}
 			do
-				wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+				wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices"
 			done
 		done
 	fi
 }
 
-Download_downstream_sources
-Download_upstream_sources
+Download_downstream_indices
+Download_upstream_indices
 
-# Process downstream sources
-DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.sources | sort -u)"
+# Process downstream indices
+DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.indices | sort -u)"
 
 echo "################################################################################"
 echo "${DOWNSTREAM_DISTRIBUTION}"
@@ -154,8 +156,8 @@ echo -n "Comparing versions... "
 
 for PACKAGE in ${DOWNSTREAM_PACKAGES}
 do
-	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}.sources | awk '/^Version: / { print $2 }' | sort -rV | head -n1)"
+	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)"
 
 	if echo ${UPSTREAM_VERSION} | grep -qs '-'
 	then
@@ -178,7 +180,7 @@ do
 
 	if [ -z "${UPSTREAM_VERSION}" ]
 	then
-		echo "${BLUE}${PACKAGE}${NORMAL} '!${DOWNSTREAM_VERSION}'"
+		echo " ${BLUE}${PACKAGE}${NORMAL} (!${DOWNSTREAM_VERSION})"
 		continue
 	fi
 
@@ -188,12 +190,12 @@ do
 		echo -n "."
 	elif dpkg --compare-versions ${UPSTREAM_VERSION} gt ${DOWNSTREAM}
 	then
-		echo "${RED}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION}'"
+		echo " ${RED}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION})"
 	elif dpkg --compare-versions ${UPSTREAM_VERSION} lt ${DOWNSTREAM}
 	then
-		echo "${YELLOW}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION}'"
+		echo " ${YELLOW}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION})"
 	else
-		echo "${PACKAGE}: internal error"
+		echo " ${PACKAGE}: internal error"
 	fi
 done