From b70f83b42b98706a47dd9e17cbcc89c099c508d6 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Thu, 10 Feb 2022 09:37:56 -0500
Subject: Add proper support for Oracle Linux native packages to installer.
 (#12101)

They got missed somehow in the initial implementation.
---
 packaging/installer/kickstart.sh         | 31 ++++++++++++++++++++++++++-----
 packaging/installer/methods/kickstart.md |  2 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh
index d37e34a45d..98b035b254 100755
--- a/packaging/installer/kickstart.sh
+++ b/packaging/installer/kickstart.sh
@@ -412,7 +412,7 @@ get_system_info() {
         SYSCODENAME="${VERSION_CODENAME}"
         SYSARCH="$(uname -m)"
 
-        supported_compat_names="debian ubuntu centos fedora opensuse"
+        supported_compat_names="debian ubuntu centos fedora opensuse ol"
 
         if str_in_list "${DISTRO}" "${supported_compat_names}"; then
             DISTRO_COMPAT_NAME="${DISTRO}"
@@ -423,13 +423,18 @@ get_system_info() {
                 ;;
             rocky|rhel)
                 DISTRO_COMPAT_NAME="centos"
-                SYSVERSION=$(echo "$SYSVERSION" | cut -d'.' -f1)
                 ;;
             *)
                 DISTRO_COMPAT_NAME="unknown"
                 ;;
             esac
         fi
+
+        case "${DISTRO_COMPAT_NAME}" in
+          centos|ol)
+            SYSVERSION=$(echo "$SYSVERSION" | cut -d'.' -f1)
+            ;;
+        esac
       else
         DISTRO="unknown"
         DISTRO_COMPAT_NAME="unknown"
@@ -772,7 +777,7 @@ pkg_installed() {
       dpkg-query --show --showformat '${Status}' "${1}" 2>&1 | cut -f 1 -d ' ' | grep -q '^install$'
       return $?
       ;;
-    centos|fedora|opensuse)
+    centos|fedora|opensuse|ol)
       rpm -q "${1}" > /dev/null 2>&1
       return $?
       ;;
@@ -789,7 +794,7 @@ netdata_avail_check() {
       env DEBIAN_FRONTEND=noninteractive apt-cache policy netdata | grep -q packagecloud.io/netdata/netdata;
       return $?
       ;;
-    centos|fedora)
+    centos|fedora|ol)
       # shellcheck disable=SC2086
       ${pm_cmd} search -v netdata | grep -qE 'Repo *: netdata(-edge)?$'
       return $?
@@ -831,7 +836,7 @@ check_special_native_deps() {
 }
 
 try_package_install() {
-  if [ -z "${DISTRO}" ]; then
+  if [ -z "${DISTRO}" ] || [ "${DISTRO}" = "unknown" ]; then
     warning "Unable to determine Linux distribution for native packages."
     return 1
   fi
@@ -923,6 +928,22 @@ try_package_install() {
       uninstall_subcmd="remove"
       INSTALL_TYPE="binpkg-rpm"
       ;;
+    ol)
+      if command -v dnf > /dev/null; then
+        pm_cmd="dnf"
+        repo_subcmd="makecache"
+      else
+        pm_cmd="yum"
+      fi
+      repo_prefix="ol/${SYSVERSION}"
+      pkg_type="rpm"
+      pkg_suffix=".noarch"
+      pkg_vsep="-"
+      pkg_install_opts="${interactive_opts}"
+      repo_update_opts="${interactive_opts}"
+      uninstall_subcmd="remove"
+      INSTALL_TYPE="binpkg-rpm"
+      ;;
     *)
       warning "We do not provide native packages for ${DISTRO}."
       return 2
diff --git a/packaging/installer/methods/kickstart.md b/packaging/installer/methods/kickstart.md
index fadb88076b..e49c8f90b7 100644
--- a/packaging/installer/methods/kickstart.md
+++ b/packaging/installer/methods/kickstart.md
@@ -136,7 +136,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do
 run the following:
 
 ```bash
-[ "0cfdc04fd4004f77ebc3c1e564ee6476" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
+[ "22039cdffef3eef21238c26605085ede" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
 ```
 
 If the script is valid, this command will return `OK, VALID`.
-- 
cgit v1.2.3