update shell-lib for RHEL/CentOS 9 support

Author: 0x6d6f7468

shell-lib/acmlib.sh

@@ -450,9 +450,8 @@ ensure_common_tools_installed () {
             $SUDO yum -y -q -e 0 install yum-utils
         fi
 
-        #Addresses AC-Hunter issue #2185
-        if [ -x /usr/bin/subscription-manager ]; then		#Only attempt this on RHEL, not Centos or other clones
-            #Note, when extending to other RHEL releases (>7.x) we'll need to test for the release version and adjust the repository name.
+        #Enable extra repository for RHEL 7.x (addresses AC-Hunter issue #2185)
+        if [ -x /usr/bin/subscription-manager -a -s /etc/redhat-release ] && grep -iq 'release 7' /etc/redhat-release ; then
             $SUDO subscription-manager repos --enable=rhel-7-server-extras-rpms
         fi
 

shell-lib/docker/install_docker.sh

@@ -91,7 +91,10 @@ elif [ -s /etc/redhat-release ] && grep -iq 'release 7\|release 8\|release 9' /e
 
 	$SUDO yum -y -q -e 0 install yum-utils device-mapper-persistent-data lvm2 shadow-utils
 
-	$SUDO yum-config-manager -q --enable extras >/dev/null
+	# Enable "extras" repo if not RHEL or CentOS Stream
+	if ! grep -iq 'red hat enterprise linux\|centos stream' /etc/redhat-release; then
+		$SUDO yum-config-manager -q --enable extras >/dev/null
+	fi
 
 	if [ ! -f /etc/yum.repos.d/docker-ce.repo ]; then
 		$SUDO yum-config-manager -q --add-repo https://download.docker.com/linux/centos/docker-ce.repo > /dev/null