commit a0d6aab4306fd470834c5e80fa0987764de4f218
author Nick Vatamaniuc <vatamane@apache.org> Fri May 26 15:35:17 2023 -0400
committer Nick Vatamaniuc <nickva@users.noreply.github.com> Fri May 26 15:38:34 2023 -0400
tree 9dc66eb0fde92834beabd9faa3b47c45953559d2
parent 73f295d0a35bed3cd08985ea74d1318b44e8505f

Fix detect-os script

Add almalinux into the mix since we use that as the base

bin/build-couchdb-pkg.sh

diff --git a/bin/build-couchdb-pkg.sh b/bin/build-couchdb-pkg.sh
index bb54abf..90a9140 100755
--- a/bin/build-couchdb-pkg.sh
+++ b/bin/build-couchdb-pkg.sh
@@ -28,7 +28,7 @@
 
 . ${SCRIPTPATH}/detect-os.sh
 
-redhats='(rhel|centos|fedora|rocky)'
+redhats='(rhel|centos|fedora|rocky|almalinux)'
 debians='(debian|ubuntu)'
 
 cd /home/jenkins

bin/build-js.sh

diff --git a/bin/build-js.sh b/bin/build-js.sh
index 5af965f..41042e2 100755
--- a/bin/build-js.sh
+++ b/bin/build-js.sh
@@ -40,7 +40,7 @@
 
 cd ${SCRIPTPATH}/..
 
-redhats='(rhel|centos|fedora|rocky)'
+redhats='(rhel|centos|fedora|rocky|almalinux)'
 debians='(debian|ubuntu)'
 if [[ ${ID} =~ ${redhats} ]]; then
   # it will always place the build path at /root/rpmbuild :(

bin/detect-os.sh

diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index a1c6a10..bd6c5df 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -68,7 +68,7 @@
     # and finally some rough heuristics
     if [[ -f /etc/redhat-release ]]; then
       # /etc/redhat-release is so inconsistent, we use rpm instead
-      rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
+      rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky|almalinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
       if [[ $rhelish ]]; then
         ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
         VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}