From 729d9be15ff95e89ae56254f8602d1f87802325e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 11 Aug 2017 08:24:44 +0200
Subject: minor changes

---
 mkrepo | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mkrepo')

diff --git a/mkrepo b/mkrepo
index cb75f98..c230b5c 100755
--- a/mkrepo
+++ b/mkrepo
@@ -17,12 +17,14 @@ fi
 
 if [ ${1:-check} != nocheck ]; then
 	echo "+ Controle des signatures"
-	rpm -K *.rpm | grep -v 'gpg OK' | cut -d: -f1 | tee $TMP
+	rpm -K *.rpm | grep -v 'gpg.*OK' | grep -v 'pgp.*OK' | cut -d: -f1 | tee $TMP
 	if [ -s $TMP ]
 	then
-		if [ $dis == fedora -a $ver -ge 26 ]
-		then rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
-		else rpmsign --define '_gpg_path /home/remi/.gnupgrpm'  --define "_gpg_name Remi Collet"            --addsign $(cat $TMP)
+		if [ "$dis" == "fedora" -a "$ver" -ge 26 ]
+		then echo "key 2017"
+			rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
+		else echo "old key"
+			rpmsign --define '_gpg_path /home/remi/.gnupgrpm'  --define "_gpg_name Remi Collet"            --addsign $(cat $TMP)
 		fi
 	else	echo OK.
 	fi
-- 
cgit