[couchdb-pkg] branch main updated: bump detect-os for centos 8 (from couchdb-ci)

[wo...@apache.org]

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

wohali pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


The following commit(s) were added to refs/heads/main by this push:
     new 65cb69d  bump detect-os for centos 8 (from couchdb-ci)
65cb69d is described below

commit 65cb69d54c2d31d8021278b6a84b84fe8693dea3
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Apr 13 19:01:43 2021 -0700

    bump detect-os for centos 8 (from couchdb-ci)
---
 bin/detect-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index f664f33..83ffb51 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|oraclelinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
+      rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux)-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/' )}