From 7887e0cafa2831f68335de13a77833032a09290d Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 31 Mar 2023 17:41:10 +0200
Subject: [PATCH] cli improvements (#1089)

* fix(init): Check directory recursion

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>

* chore(cli): Reload if only change detected

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>

---------

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/init.sh        |  5 +++--
 scripts/helmcharts/openreplay-cli | 12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh
index 5652240de..70843d15b 100644
--- a/scripts/helmcharts/init.sh
+++ b/scripts/helmcharts/init.sh
@@ -175,13 +175,14 @@ function main() {
     sudo mkdir -p /var/lib/openreplay
     sudo cp -f openreplay-cli /bin/openreplay
     install_openreplay
-    [[ ! -d /var/lib/openreplay/openreplay ]] || {
+    # If you install multiple times using init.sh, Only keep the latest installation
+    if [[ ! -d /var/lib/openreplay/openreplay ]] && [[ $(pwd) != "/var/lib/openreplay/openreplay/scripts/helmcharts/" ]] ; then
       cd /var/lib/openreplay/openreplay
       date +%m-%d-%Y-%H%M%S | sudo tee -a /var/lib/openreplay/or_versions.txt
       sudo git log -1 2>&1 | sudo tee -a /var/lib/openreplay/or_versions.txt
       sudo rm -rf /var/lib/openreplay/openreplay
       cd -
-    }
+    fi
     sudo cp -rf $(cd ../.. && pwd) /var/lib/openreplay/openreplay
     sudo cp -rf ./vars.yaml /var/lib/openreplay/
   }
diff --git a/scripts/helmcharts/openreplay-cli b/scripts/helmcharts/openreplay-cli
index d518cc186..fc1f86365 100755
--- a/scripts/helmcharts/openreplay-cli
+++ b/scripts/helmcharts/openreplay-cli
@@ -377,12 +377,18 @@ do
               Or ${BWHITE}helm upgrade openreplay -n app openreplay/scripts/helmcharts/openreplay -f openreplay/scripts/helmcharts/vars.yaml --debug --atomic"
         exit 100
       }
+      /var/lib/openreplay/busybox md5sum /var/lib/openreplay/vars.yaml > "${tmp_dir}/var.yaml.md5"
       sudo vim -n ${OR_DIR}/vars.yaml
-      /var/lib/openreplay/yq 'true' /var/lib/openreplay/vars.yaml || {
-        log debug "seems like the edit is not correct. Rerun ${BWHITE}openreplay -e${YELLOW} after fixing the issue."
+      /var/lib/openreplay/yq 'true' /var/lib/openreplay/vars.yaml &> /dev/null || {
+        log debug "seems like the edit is not correct. Rerun ${BWHITE}openreplay -e${YELLOW} and fix the issue in config file."
+        clean_tmp_dir
         exit 100
       }
-      reload
+      if /var/lib/openreplay/busybox md5sum -c "${tmp_dir}/var.yaml.md5"; then
+        log info "No change detected in ${BWHITE}${OR_DIR}/vars.yaml${GREEN}. Not reloading"
+      else
+        reload
+      fi
       clean_tmp_dir
       exit 0
     ;;