From 1869c656b296445e87d8afa6cb2fcfdf663d6bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesus=20Hernando=20Paz=20Bola=C3=B1os?=
 <jesus@nodesource.com>
Date: Tue, 28 Dec 2021 09:44:26 -0500
Subject: [PATCH] Update Fedora regex

---
 rpm/setup           | 2 +-
 rpm/setup_0.10      | 2 +-
 rpm/setup_0.12      | 2 +-
 rpm/setup_10.x      | 2 +-
 rpm/setup_11.x      | 2 +-
 rpm/setup_12.x      | 2 +-
 rpm/setup_13.x      | 2 +-
 rpm/setup_14.x      | 2 +-
 rpm/setup_15.x      | 2 +-
 rpm/setup_16.x      | 2 +-
 rpm/setup_17.x      | 2 +-
 rpm/setup_4.x       | 2 +-
 rpm/setup_5.x       | 2 +-
 rpm/setup_6.x       | 2 +-
 rpm/setup_7.x       | 2 +-
 rpm/setup_8.x       | 2 +-
 rpm/setup_9.x       | 2 +-
 rpm/setup_current.x | 2 +-
 rpm/setup_iojs_1.x  | 2 +-
 rpm/setup_iojs_2.x  | 2 +-
 rpm/setup_iojs_3.x  | 2 +-
 rpm/setup_lts.x     | 2 +-
 rpm/src/_setup.sh   | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/rpm/setup b/rpm/setup
index c5c20c41..69fc2d45 100644
--- a/rpm/setup
+++ b/rpm/setup
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_0.10 b/rpm/setup_0.10
index d16625da..b28ad2bd 100644
--- a/rpm/setup_0.10
+++ b/rpm/setup_0.10
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_0.12 b/rpm/setup_0.12
index 50cbd3e1..5388a6f1 100644
--- a/rpm/setup_0.12
+++ b/rpm/setup_0.12
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_10.x b/rpm/setup_10.x
index 1c6cbf81..f0664a51 100644
--- a/rpm/setup_10.x
+++ b/rpm/setup_10.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_11.x b/rpm/setup_11.x
index 9f3db1e5..2e6a014b 100644
--- a/rpm/setup_11.x
+++ b/rpm/setup_11.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_12.x b/rpm/setup_12.x
index f869acf5..399a9079 100644
--- a/rpm/setup_12.x
+++ b/rpm/setup_12.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_13.x b/rpm/setup_13.x
index dd5d5250..09b8f5cb 100644
--- a/rpm/setup_13.x
+++ b/rpm/setup_13.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_14.x b/rpm/setup_14.x
index 6d379947..7ead82c1 100644
--- a/rpm/setup_14.x
+++ b/rpm/setup_14.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_15.x b/rpm/setup_15.x
index a8fa2c53..e9ed9d6f 100644
--- a/rpm/setup_15.x
+++ b/rpm/setup_15.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_16.x b/rpm/setup_16.x
index 3d5b88bd..6609e7f9 100644
--- a/rpm/setup_16.x
+++ b/rpm/setup_16.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_17.x b/rpm/setup_17.x
index ede25e8c..af56f452 100644
--- a/rpm/setup_17.x
+++ b/rpm/setup_17.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_4.x b/rpm/setup_4.x
index 7bda6107..f837a7a7 100644
--- a/rpm/setup_4.x
+++ b/rpm/setup_4.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_5.x b/rpm/setup_5.x
index d080bc0c..a19e31bb 100644
--- a/rpm/setup_5.x
+++ b/rpm/setup_5.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_6.x b/rpm/setup_6.x
index 0470f723..26cc5bb7 100644
--- a/rpm/setup_6.x
+++ b/rpm/setup_6.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_7.x b/rpm/setup_7.x
index c7d5c10c..d2251584 100644
--- a/rpm/setup_7.x
+++ b/rpm/setup_7.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_8.x b/rpm/setup_8.x
index cfaca25e..4dddd7b7 100644
--- a/rpm/setup_8.x
+++ b/rpm/setup_8.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_9.x b/rpm/setup_9.x
index 8ec7dad6..388352ff 100644
--- a/rpm/setup_9.x
+++ b/rpm/setup_9.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_current.x b/rpm/setup_current.x
index 31308d93..6871b427 100644
--- a/rpm/setup_current.x
+++ b/rpm/setup_current.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_iojs_1.x b/rpm/setup_iojs_1.x
index a3c1033d..d0df5f85 100644
--- a/rpm/setup_iojs_1.x
+++ b/rpm/setup_iojs_1.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_iojs_2.x b/rpm/setup_iojs_2.x
index 716a404a..ba0ef93a 100644
--- a/rpm/setup_iojs_2.x
+++ b/rpm/setup_iojs_2.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_iojs_3.x b/rpm/setup_iojs_3.x
index 5d2b47e2..6ffbf40a 100644
--- a/rpm/setup_iojs_3.x
+++ b/rpm/setup_iojs_3.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/setup_lts.x b/rpm/setup_lts.x
index 7458eb30..d73d1689 100644
--- a/rpm/setup_lts.x
+++ b/rpm/setup_lts.x
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi
diff --git a/rpm/src/_setup.sh b/rpm/src/_setup.sh
index 659df4aa..95a4cb1f 100644
--- a/rpm/src/_setup.sh
+++ b/rpm/src/_setup.sh
@@ -235,7 +235,7 @@ else
   ## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
   ## extract the major version number of the distro
   if [[ $DIST_TYPE =~ fc ]]; then 
-    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')    
+    DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')    
   else
     DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
   fi