From da30fbe32b6c38f1eac211bb6f0c418b0ef2f13f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 11 May 2022 12:17:24 +0200
Subject: scl php82 helpers

---
 buildfct  | 31 +++++++++++++++++++++++++++++++
 getmock   | 16 ++++++++++++++++
 mkmodular |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/buildfct b/buildfct
index 9682ca8..16f6771 100644
--- a/buildfct
+++ b/buildfct
@@ -34,6 +34,7 @@ alias mockfc35xscl73="           mock --configdir=$mocketc -r fc35xscl73
 alias mockfc35xscl74="           mock --configdir=$mocketc -r fc35xscl74          rebuild "
 alias mockfc35xscl80="           mock --configdir=$mocketc -r fc35xscl80          rebuild "
 alias mockfc35xscl81="           mock --configdir=$mocketc -r fc35xscl81          rebuild "
+alias mockfc35xscl82="           mock --configdir=$mocketc -r fc35xscl82          rebuild "
 
 alias mockfc36i="  setarch i686  mock --configdir=$mocketc -r fc36i   --arch i686 rebuild "
 alias mockfc36x="                mock --configdir=$mocketc -r fc36x               rebuild "
@@ -45,6 +46,7 @@ alias mockfc36x81="              mock --configdir=$mocketc -r fc36x81
 alias mockfc36xscl74="           mock --configdir=$mocketc -r fc36xscl74          rebuild "
 alias mockfc36xscl80="           mock --configdir=$mocketc -r fc36xscl80          rebuild "
 alias mockfc36xscl81="           mock --configdir=$mocketc -r fc36xscl81          rebuild "
+alias mockfc36xscl82="           mock --configdir=$mocketc -r fc36xscl82          rebuild "
 
 alias mockel6i="  setarch i686 mock --configdir=$mocketc -r el6i   --arch i686 rebuild "
 alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it  --arch i686 rebuild "
@@ -94,6 +96,7 @@ alias mockel7xscl73="          mock --configdir=$mocketc -r el7xscl73          r
 alias mockel7xscl74="          mock --configdir=$mocketc -r el7xscl74          rebuild "
 alias mockel7xscl80="          mock --configdir=$mocketc -r el7xscl80          rebuild "
 alias mockel7xscl81="          mock --configdir=$mocketc -r el7xscl81          rebuild "
+alias mockel7xscl82="          mock --configdir=$mocketc -r el7xscl82          rebuild "
 
 alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
 alias mockel8xr="              mock --configdir=$mocketc -r el8xr              rebuild "
@@ -111,6 +114,7 @@ alias mockel8xscl73="          mock --configdir=$mocketc -r el8xscl73          r
 alias mockel8xscl74="          mock --configdir=$mocketc -r el8xscl74          rebuild "
 alias mockel8xscl80="          mock --configdir=$mocketc -r el8xscl80          rebuild "
 alias mockel8xscl81="          mock --configdir=$mocketc -r el8xscl81          rebuild "
+alias mockel8xscl82="          mock --configdir=$mocketc -r el8xscl82          rebuild "
 
 alias mockel9x="               mock --configdir=$mocketc -r el9x               rebuild "
 alias mockel9xr="              mock --configdir=$mocketc -r el9xr              rebuild "
@@ -121,6 +125,7 @@ alias mockel9x81="             mock --configdir=$mocketc -r el9x81             r
 alias mockel9xscl74="          mock --configdir=$mocketc -r el9xscl74          rebuild "
 alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
 alias mockel9xscl81="          mock --configdir=$mocketc -r el9xscl81          rebuild "
+alias mockel9xscl82="          mock --configdir=$mocketc -r el9xscl82          rebuild "
 
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
@@ -455,6 +460,32 @@ else
 fi
 }
 
+# Build All distribution / version / 64bits for remi/scl-php82
+mockscl82x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  for i in 35 36
+  do
+    echo -n "$(date +%X) scl82 fc$i "
+    mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
+  done
+  for i in 7 8 9
+  do
+    echo -n "$(date +%X) scl82 el$i  "
+    mock $quiet --configdir=$mocketc -r el${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
+  done
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/scl-php81
 mockscl81x()
 {
diff --git a/getmock b/getmock
index c6124db..ab23eca 100755
--- a/getmock
+++ b/getmock
@@ -15,6 +15,9 @@ esac
 rep=${2-remi}
 
 case $dep in 
+scl82el*)	dep=${dep#scl82el}
+	type=enterprise
+	;;
 scl81el*)	dep=${dep#scl81el}
 	type=enterprise
 	;;
@@ -171,6 +174,9 @@ el*)	dep=${dep#el}
 fc*)	dep=${dep#fc}
 	type=fedora
 	;;
+scl82fc*)	dep=${dep#scl82fc}
+	type=fedora
+	;;
 scl81fc*)	dep=${dep#scl81fc}
 	type=fedora
 	;;
@@ -484,6 +490,16 @@ elif [ $1 = scl71 ]; then
 		getOneMock scl71el${i}x $opt
 	done
 
+elif [ $1 = scl82 ]; then
+	for i in 35 36
+	do
+		getOneMock scl82fc${i}x $opt
+	done
+	for i in 7 8 9
+	do
+		getOneMock scl82el${i}x $opt
+	done
+
 elif [ $1 = scl81 ]; then
 	for i in 34 35 36
 	do
diff --git a/mkmodular b/mkmodular
index 47f9f9d..a455ff0 100755
--- a/mkmodular
+++ b/mkmodular
@@ -284,7 +284,7 @@ function genDefaults($name, $def, Array $vers) {
 	             "data:\n" .
 	             "  module: $name\n";
 	if ($def) {
-		$meta .= "  stream: $def\n";
+		$meta .= "  stream: \"$def\"\n";
 	}
 	$meta .=     "  profiles:\n";
 	foreach ($vers as $ver) {
-- 
cgit