From 89e3915b36663ef570d2af17c8c2ae7eeec028ea Mon Sep 17 00:00:00 2001
From: vicagarcia <vgarcia@cyral.com>
Date: Thu, 29 Aug 2024 11:28:45 -0600
Subject: [PATCH 1/2] RPM name changed from cyral-sidecar to sidecar, so update
 the install script to find it and uninstall correctly

---
 install-linux.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install-linux.sh b/install-linux.sh
index e5ce2ed..a7b9b32 100755
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -103,9 +103,9 @@ get_os_major_version_id () {
 do_rpm_install(){
   get_package "rpm"
   sleep 2
-  if rpm -q cyral-sidecar > /dev/null 2>&1; then
+  if rpm -q sidecar > /dev/null 2>&1; then
     echo "Removing existing installation..."
-    rpm -e --erase cyral-sidecar > /dev/null 2>&1
+    rpm -e --erase sidecar > /dev/null 2>&1
     rm -f "$(grep "discovery-database" /etc/cyral/cyral-service-monitor/config.yaml 2>/dev/null| awk '{print $2}')"
     rm -f /etc/cyral/conf.d/sidecar.db
   fi
@@ -116,9 +116,9 @@ do_rpm_install(){
 do_dpkg_install(){
   get_package "deb"
   sleep 2
-  if dpkg -s cyral-sidecar > /dev/null 2>&1; then
+  if dpkg -s sidecar > /dev/null 2>&1; then
     echo "Removing existing installation..."
-    dpkg -r cyral-sidecar > /dev/null 2>&1
+    dpkg -r sidecar > /dev/null 2>&1
     rm -f "$(grep "discovery-database" /etc/cyral/cyral-service-monitor/config.yaml 2>/dev/null| awk '{print $2}')"
     rm -f /etc/cyral/conf.d/sidecar.db
   fi

From 9f1968dc31e3ad23beb34b3a728c0d9bf325b2d3 Mon Sep 17 00:00:00 2001
From: vicagarcia <vgarcia@cyral.com>
Date: Thu, 29 Aug 2024 12:10:22 -0600
Subject: [PATCH 2/2] Added check for the old cyral-sidecar in case it exists

---
 install-linux.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/install-linux.sh b/install-linux.sh
index a7b9b32..d332eb6 100755
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -103,8 +103,10 @@ get_os_major_version_id () {
 do_rpm_install(){
   get_package "rpm"
   sleep 2
-  if rpm -q sidecar > /dev/null 2>&1; then
+  if rpm -q cyral-sidecar > /dev/null 2>&1 || rpm -q sidecar > /dev/null 2>&1; then
     echo "Removing existing installation..."
+    # Split this call in 2 because rpm wont uninstall any package if one or more dont exist
+    rpm -e --erase cyral-sidecar > /dev/null 2>&1
     rpm -e --erase sidecar > /dev/null 2>&1
     rm -f "$(grep "discovery-database" /etc/cyral/cyral-service-monitor/config.yaml 2>/dev/null| awk '{print $2}')"
     rm -f /etc/cyral/conf.d/sidecar.db
@@ -116,9 +118,9 @@ do_rpm_install(){
 do_dpkg_install(){
   get_package "deb"
   sleep 2
-  if dpkg -s sidecar > /dev/null 2>&1; then
+  if dpkg -s cyral-sidecar > /dev/null 2>&1 || dpkg -s sidecar > /dev/null 2>&1; then
     echo "Removing existing installation..."
-    dpkg -r sidecar > /dev/null 2>&1
+    dpkg -r cyral-sidecar sidecar > /dev/null 2>&1
     rm -f "$(grep "discovery-database" /etc/cyral/cyral-service-monitor/config.yaml 2>/dev/null| awk '{print $2}')"
     rm -f /etc/cyral/conf.d/sidecar.db
   fi