From 3b595b6970c4ba83995b1b894641330e41e60f77 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 4 Nov 2020 10:57:32 +0100
Subject: add mockepel874

---
 buildfct | 27 ++++++++++++++-------------
 getmock  |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/buildfct b/buildfct
index 41a6df8..7fec1ac 100644
--- a/buildfct
+++ b/buildfct
@@ -119,6 +119,7 @@ alias mockel8xscl80="          mock --configdir=$mocketc -r el8xscl80          r
 
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
+alias mockepel874="            mock --configdir=$mocketc -r epel874            rebuild "
 
 alias mockdevi="setarch i686 mock -r fedora-devel-i386   rebuild "
 alias mockdevx="             mock -r fedora-devel-x86_64 rebuild "
@@ -256,7 +257,7 @@ fi
 
 if [ -f "$1" ]; then
   echo -n "$(date +%X) 70 el6  "
-  setarch i686    mock $quiet --configdir=$mocketc -r el6i70  --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  setarch i686    mock $quiet --configdir=$mocketc -r el6i70  --arch i686 rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -274,7 +275,7 @@ fi
 
 if [ -f "$1" ]; then
   echo -n "$(date +%X) 71 el6  "
-  setarch i686    mock $quiet --configdir=$mocketc -r  el6i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  setarch i686    mock $quiet --configdir=$mocketc -r  el6i71 --arch i686 rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -292,7 +293,7 @@ fi
 
 if [ -f "$1" ]; then
   echo -n "$(date +%X) 72 el6  "
-  setarch i686    mock $quiet --configdir=$mocketc -r  el6i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  setarch i686    mock $quiet --configdir=$mocketc -r  el6i72 --arch i686 rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -310,7 +311,7 @@ fi
 
 if [ -f "$1" ]; then
   echo -n "$(date +%X) 73 el6  "
-  setarch i686    mock $quiet --configdir=$mocketc -r  el6i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  setarch i686    mock $quiet --configdir=$mocketc -r  el6i73 --arch i686 rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -324,7 +325,7 @@ echo "Nothing."
 }
 
 # Build All distribution / version / 32bits for remi/remi-php80
-mock74i()
+mock80i()
 {
 echo "Nothing."
 }
@@ -639,7 +640,7 @@ if [ -f "$1" ]; then
   for i in 7 6
   do
     echo -n "$(date +%X) 70 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x70 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x70 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   date +%X
 else
@@ -660,7 +661,7 @@ if [ -f "$1" ]; then
   for i in 7 6
   do
     echo -n "$(date +%X) 71 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x71 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x71 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   date +%X
 else
@@ -681,7 +682,7 @@ if [ -f "$1" ]; then
   for i in 8 7 6
   do
     echo -n "$(date +%X) 72 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x72 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   date +%X
 else
@@ -702,7 +703,7 @@ if [ -f "$1" ]; then
   for i in 8 7 6
   do
     echo -n "$(date +%X) 73 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x73 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   date +%X
 else
@@ -723,12 +724,12 @@ if [ -f "$1" ]; then
   for i in 31
   do
     echo -n "$(date +%X) 74 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   for i in 8 7
   do
     echo -n "$(date +%X) 74 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   date +%X
 else
@@ -749,12 +750,12 @@ if [ -f "$1" ]; then
   for i in 31 32 33
   do
     echo -n "$(date +%X) 80 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
   done
   for i in 8 7
   do
     echo -n "$(date +%X) 80 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x80 rebuild $1 && echo " Ok." || echo " Error !"
+    mock $quiet --configdir=$mocketc -r el${i}x80 rebuild "$@"&& echo " Ok." || echo " Error !"
   done
   date +%X
 else
diff --git a/getmock b/getmock
index 0b7618a..a4f7606 100755
--- a/getmock
+++ b/getmock
@@ -283,7 +283,7 @@ if [ $1 = glpi94 ]; then
 	opt=glpi94
 	shift
 fi
-if [ $1 = redis50 -o $1 = redis60 ]; then
+if [ $1 = redis50 -o $1 = redis60 -o $1 = composer1 -o $1 = composer2 ]; then
 	opt=$1
 	shift
 fi
-- 
cgit