add 2021 key

1 files changed, 16 insertions, 5 deletions

diff --git a/mkallrepo b/mkallrepo
index e339da4..340f28b 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -3,10 +3,10 @@
 TMPSIG=$(mktemp)
 TMPLNK=$(mktemp)
 TMPSIG1=$(mktemp -t XXXXXXXX.2000)
-TMPSIG2=$(mktemp -t XXXXXXXX.2017)
 TMPSIG3=$(mktemp -t XXXXXXXX.2018)
 TMPSIG4=$(mktemp -t XXXXXXXX.2019)
 TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
+TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 
 cd /home/rpmbuild/site/rpms
 
@@ -36,15 +36,27 @@ find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG
 if [ -s $TMPSIG ]; then
     echo "À signer:"; sort < $TMPSIG
 
+	# old
+    grep el7     $TMPSIG  > $TMPSIG1
+	# 2018
     grep el8     $TMPSIG  > $TMPSIG3
-
+	# 2019
     grep fc30    $TMPSIG  > $TMPSIG4
     grep fc31    $TMPSIG >> $TMPSIG4
-
+	# 2020
     grep fc32    $TMPSIG  > $TMPSIG2020
     grep fc33    $TMPSIG >> $TMPSIG2020
-    grep src.rpm $TMPSIG >> $TMPSIG2020
+	# 2021
+    grep fc34    $TMPSIG  > $TMPSIG2021
+    grep src.rpm $TMPSIG >> $TMPSIG2021
 
+    if [ -s $TMPSIG2021 ]; then
+		echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2021)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
     if [ -s $TMPSIG2020 ]; then
 		echo "== Signature des $(cat $TMPSIG2020 | wc -l) nouveaux RPM (2020) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2020)
@@ -66,7 +78,6 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc3 $TMPSIG | grep -v src.rpm | grep -v el8 > $TMPSIG1
     if [ -s $TMPSIG1 ]; then
 		echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG1)