[couchdb-pkg] branch add-almalinux-to-os-target-detect updated (3c46401 -> 7acce5a)

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch add-almalinux-to-os-target-detect
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


 discard 3c46401  Fix detect-os script
     new 7acce5a  Fix detect-os script

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3c46401)
            \
             N -- N -- N   refs/heads/add-almalinux-to-os-target-detect (7acce5a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/build-couchdb-pkg.sh | 2 +-
 bin/build-js.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[couchdb-pkg] 01/01: Fix detect-os script

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch add-almalinux-to-os-target-detect
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit 7acce5a1483f8a814b3cdba208f5bea0a19cdc02
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri May 26 15:35:17 2023 -0400

    Fix detect-os script
    
    Add almalinux into the mix since we use that as the base
---
 bin/build-couchdb-pkg.sh | 2 +-
 bin/build-js.sh          | 2 +-
 bin/detect-os.sh         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 . ${SCRIPTPATH}/detect-os.sh
 
-redhats='(rhel|centos|fedora|rocky)'
+redhats='(rhel|centos|fedora|rocky|almalinux)'
 debians='(debian|ubuntu)'
 
 cd /home/jenkins
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 @@ fi
 
 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 :(
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 @@ case "${OSTYPE}" in
     # 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/' )}