Updating.

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

8 files changed, 63 insertions, 12 deletions

diff --git a/BFH-check-missing-builds.sh b/BFH-check-missing-builds.sh
index 3a10153..9a175a2 100755
--- a/BFH-check-missing-builds.sh
+++ b/BFH-check-missing-builds.sh
@@ -14,18 +14,15 @@ then
 	read -s PASSWORD
 fi
 
-DISTRIBUTION="buster"
-DISTRIBUTION="buster-backports"
-
-PACKAGES="$(wget -q https://${USER}:${PASSWORD}@git.bfh.science/packages/${DISTRIBUTION}/ -O - | grep "sublevel-repo'><a title=" | sed -e "s|^.*<a title='||g" -e "s|'.*$||")"
+PACKAGES="$(wget -q https://${USER}:${PASSWORD}@git.bfh.science/packages/ -O - | grep "sublevel-repo'><a title=" | sed -e "s|^.*<a title='||g" -e "s|'.*$||")"
 
 echo
 echo "Present in git, missing debs:"
 
 for PACKAGE in ${PACKAGES}
 do
-	if ! wget -q https://apt.bfh.science/archive/${DISTRIBUTION}/${PACKAGE}/current_amd64 -O /dev/null 2>&1 && \
-	   ! wget -q https://apt.bfh.science/archive/${DISTRIBUTION}/${PACKAGE}/current_all -O /dev/null 2>&1
+	if ! wget -q https://apt.bfh.science/archive/${PACKAGE}/current_amd64 -O /dev/null 2>&1 && \
+	   ! wget -q https://apt.bfh.science/archive/${PACKAGE}/current_all -O /dev/null 1>&1
 	then
 		echo "  ${PACKAGE}"
 	fi
diff --git a/ignore.txt b/ignore.txt
new file mode 100644
index 0000000..deb234d
--- /dev/null
+++ b/ignore.txt
@@ -0,0 +1,10 @@
+# progress-linux
+cryptsetup 2:2.3.4-1+exp1
+e2fsprogs 1.46~WIP.2019.10.03-1
+icu 68.1~rc-1
+libgit2 1.0.1+dfsg.1-1
+libreoffice 1:7.0.3~rc1-1
+openssl 3.0.0~~alpha4-1
+
+# bfh
+octave 6.0.90-1
diff --git a/todo.sh b/todo.sh
new file mode 100755
index 0000000..2e7fe5c
--- /dev/null
+++ b/todo.sh
@@ -0,0 +1 @@
+clear && git clean -dxf && ./update.engywuck && ./update.engywuck-backports && ./update.fuchur
diff --git a/update b/update
index fb55e64..d83badc 100755
--- a/update
+++ b/update
@@ -11,11 +11,44 @@ case "${MODE}" in
 	engywuck)
 		UPSTREAM_DISTRIBUTIONS="buster buster-updates buster-proposed-updates"
 		DOWNSTREAM_DISTRIBUTION="engywuck"
+		DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
+		DOWNSTREAM_TAG="progress"
 		;;
 
 	engywuck-backports)
 		UPSTREAM_DISTRIBUTIONS="sid experimental"
 		DOWNSTREAM_DISTRIBUTION="engywuck-backports"
+		DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
+		DOWNSTREAM_TAG="progress"
+		;;
+
+	fuchur)
+		#UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates"
+		UPSTREAM_DISTRIBUTIONS="sid"
+		DOWNSTREAM_DISTRIBUTION="fuchur"
+		DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
+		DOWNSTREAM_TAG="progress"
+		;;
+
+	fuchur-backports)
+		UPSTREAM_DISTRIBUTIONS="sid experimental"
+		DOWNSTREAM_DISTRIBUTION="fuchur-backports"
+		DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
+		DOWNSTREAM_TAG="progress"
+		;;
+
+	buster)
+		UPSTREAM_DISTRIBUTIONS="buster buster-updates buster-proposed-updates"
+		DOWNSTREAM_DISTRIBUTION="buster"
+		DOWNSTREAM_MIRROR="https://apt.bfh.science/packages"
+		DOWNSTREAM_TAG="bfh"
+		;;
+
+	buster-backports)
+		UPSTREAM_DISTRIBUTIONS="sid experimental"
+		DOWNSTREAM_DISTRIBUTION="buster-backports"
+		DOWNSTREAM_MIRROR="https://apt.bfh.science/packages"
+		DOWNSTREAM_TAG="bfh"
 		;;
 esac
 
@@ -23,9 +56,6 @@ UPSTREAM_SECTIONS="main contrib non-free"
 UPSTREAM_MIRROR="http://debian.ethz.ch/debian"
 
 DOWNSTREAM_SECTIONS="main contrib non-free"
-DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
-
-DOWNSTREAM_TAG="progress"
 
 Download_downstream_sources ()
 {
@@ -40,7 +70,7 @@ Download_downstream_sources ()
 	then
 		for SECTION in ${DOWNSTREAM_SECTIONS}
 		do
-			wget -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}.sources"
 		done
 	fi
 }
@@ -67,7 +97,7 @@ Download_upstream_sources ()
 					then
 						for SECTION in ${UPSTREAM_SECTIONS}
 						do
-							wget -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}.sources"
 						done
 					fi
 					;;
@@ -75,7 +105,7 @@ Download_upstream_sources ()
 
 			for SECTION in ${UPSTREAM_SECTIONS}
 			do
-				wget -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}.sources"
 			done
 		done
 	fi
@@ -92,6 +122,10 @@ Download_upstream_sources
 # Process downstream sources
 DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.sources | sort -u)"
 
+echo "################################################################################"
+echo "${DOWNSTREAM_DISTRIBUTION}"
+echo "################################################################################"
+
 echo -n "Comparing versions... "
 
 for PACKAGE in ${DOWNSTREAM_PACKAGES}
@@ -108,6 +142,11 @@ do
 		DOWNSTREAM="$(echo ${DOWNSTREAM_VERSION} | sed -e "s|-0.0~${DOWNSTREAM_TAG}.*||" -e "s|-0.*${DOWNSTREAM_TAG}.*||")"
 	fi
 
+	if grep -qs "^${PACKAGE} ${UPSTREAM_VERSION}$" ignore.txt
+	then
+		continue
+	fi
+
 	# comparing versions
 	if dpkg --compare-versions ${UPSTREAM_VERSION} eq ${DOWNSTREAM}
 	then
diff --git a/update.buster b/update.buster
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/update.buster
@@ -0,0 +1 @@
+update
\ No newline at end of file
diff --git a/update.buster-backports b/update.buster-backports
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/update.buster-backports
@@ -0,0 +1 @@
+update
\ No newline at end of file
diff --git a/update.fuchur b/update.fuchur
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/update.fuchur
@@ -0,0 +1 @@
+update
\ No newline at end of file
diff --git a/update.fuchur-backports b/update.fuchur-backports
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/update.fuchur-backports
@@ -0,0 +1 @@
+update
\ No newline at end of file