cleanup and EL-9 helpers

1 files changed, 4 insertions, 38 deletions

diff --git a/buildfct b/buildfct
index 1f30f63..9f2e188 100644
--- a/buildfct
+++ b/buildfct
@@ -131,8 +131,10 @@ alias mockel8xscl81="          mock --configdir=$mocketc -r el8xscl81          r
 alias mockel9x="               mock --configdir=$mocketc -r el9x               rebuild "
 alias mockel9xr="              mock --configdir=$mocketc -r el9xr              rebuild "
 alias mockel9n="               mock --configdir=$mocketc -r el9n               rebuild "
+alias mockel9x74="             mock --configdir=$mocketc -r el9x74             rebuild "
 alias mockel9x80="             mock --configdir=$mocketc -r el9x80             rebuild "
 alias mockel9x81="             mock --configdir=$mocketc -r el9x81             rebuild "
+alias mockel9xscl74="          mock --configdir=$mocketc -r el9xscl74          rebuild "
 alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
 alias mockel9xscl81="          mock --configdir=$mocketc -r el9xscl81          rebuild "
 
@@ -258,42 +260,6 @@ else
 fi
 }
 
-# Build All distribution / version / noarch for remi using PHP >= 7.3
-mock73n()
-{
-quiet="--quiet"
-if [ "$1" = "-q" ]; then
-    shift
-fi
-
-if [ -f "$1" ]; then
-  date +%X
-  pids=""
-  for i in 33 34 35
-  do
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
-    pids="$pids $!"
-  done
-  for i in 7
-  do
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r el${i}x73 rebuild "$@" && echo "$(date +%X) (73) el$i   Ok." || echo "el$i  Error !")&
-    pids="$pids $!"
-  done
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (74) el8   Ok." || echo "el8  Error !")&
-    pids="$pids $!"
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r el9x      rebuild "$@" && echo "$(date +%X) (80) el9   Ok." || echo "el9  Error !")&
-    pids="$pids $!"
-  wait $pids
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution / version / noarch for remi using PHP >= 7.4
 mock74n()
 {
@@ -487,7 +453,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 9 8 7
   do
     echo -n "$(date +%X) 74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -617,7 +583,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 7 8
+  for i in 7 9 8
   do
     echo -n "$(date +%X) scl74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"