cleanup

3 files changed, 26 insertions, 34 deletions

diff --git a/buildfct b/buildfct
index aecace9..eb3718b 100644
--- a/buildfct
+++ b/buildfct
@@ -139,7 +139,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -207,7 +207,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -228,7 +228,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -256,7 +256,7 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
-  for i in 7 6
+  for i in 7
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo "$(date +%X) (72) el$i   Ok." || echo "el$i  Error !")&
@@ -289,7 +289,7 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild $1 && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
-  for i in 7 6
+  for i in 7
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el${i}x73 rebuild $1 && echo "$(date +%X) (73) el$i   Ok." || echo "el$i  Error !")&
@@ -322,7 +322,7 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (72) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
-#  for i in 7 6
+#  for i in 7
 #  do
 #    echo -n ""
 #    (mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo "$(date +%X) (72) el$i   Ok." || echo "el$i  Error !")&
@@ -348,7 +348,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) 55 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -390,7 +390,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) 56 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -411,7 +411,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) 70 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x70 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -432,7 +432,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) 71 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x71 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -453,7 +453,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7 6
+  for i in 8 7
   do
     echo -n "$(date +%X) 72 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x72 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -474,7 +474,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7 6
+  for i in 8 7
   do
     echo -n "$(date +%X) 73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x73 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -604,7 +604,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 6 7 8
+  for i in 7 8
   do
     echo -n "$(date +%X) scl73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -630,7 +630,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 8 6 7
+  for i in 8 7
   do
     echo -n "$(date +%X) scl72 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -656,7 +656,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 8 7 6
+  for i in 8 7
   do
     echo -n "$(date +%X) scl71 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -682,7 +682,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 8 7 6
+  for i in 8 7
   do
     echo -n "$(date +%X) scl70 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -708,7 +708,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 8 7 6
+  for i in 8 7
   do
     echo -n "$(date +%X) scl56 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -729,7 +729,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) scl55 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -750,7 +750,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) scl54 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
@@ -771,7 +771,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 6
+  for i in 7
   do
     echo -n "$(date +%X) test-el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xt rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/cleanoldrpm b/cleanoldrpm
index b21e9e3..0e54faa 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -8,7 +8,7 @@ $keep = 0;
 $dest = false;
 $multi = [
 	'php'		=> 3, 	// php/8.0
-	'redis'		=> 1,	// redis/6
+	'redis'		=> 3,	// redis/6.2
 	'composer' 	=> 1,	// composer/2
 ];
 if (isset($_SERVER['argv'][1])) {
diff --git a/getmock b/getmock
index 8f71008..4ba8653 100755
--- a/getmock
+++ b/getmock
@@ -267,23 +267,15 @@ if [ $1 = php73 ]; then
 	opt=php73
 	shift
 fi
-if [ $1 = glpi91 ]; then
-	opt=glpi91
-	shift
-fi
-if [ $1 = glpi92 ]; then
-	opt=glpi92
-	shift
-fi
-if [ $1 = glpi93 ]; then
-	opt=glpi93
+if [[ $1 == glpi* ]]; then
+	opt=$1
 	shift
 fi
-if [ $1 = glpi94 ]; then
-	opt=glpi94
+if [[ $1 == redis* ]]; then
+	opt=$1
 	shift
 fi
-if [ $1 = redis50 -o $1 = redis60 -o $1 = composer1 -o $1 = composer2 ]; then
+if [[ $1 == composer* ]]; then
 	opt=$1
 	shift
 fi