From 90fa146190edb6f7107ff956759352a53af0ec9d Mon Sep 17 00:00:00 2001
From: Oleg Sheynin <osheynin@gmail.com>
Date: Mon, 5 Aug 2024 18:17:12 -0400
Subject: [PATCH] fix

---
 cronjobs/save_cronjobs.sh | 32 +++++++++++++++++---------------
 release_version.txt       |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/cronjobs/save_cronjobs.sh b/cronjobs/save_cronjobs.sh
index 894e1f0..cf32cea 100755
--- a/cronjobs/save_cronjobs.sh
+++ b/cronjobs/save_cronjobs.sh
@@ -5,23 +5,23 @@ usage() {
     exit 1
 }
 
-get_hosts_json() {
-    curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts | ${HOME}/bin/hjson -j
-}
-
 get_user_hosts() {
-    User=${1}
-    Domain=${2}
+    local User=${1}
+    local Domain=${2}
 
-    get_hosts_json | jq -r \
-        --arg domain "${Domain}" \
-        --arg usr "${User}" \
-        '.[$domain] | to_entries[] | select(.value.users[] | contains($usr)) | .key'
+    Cmd="curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts"
+    Cmd="${Cmd} | ${HOME}/bin/hjson -j"
+    Cmd="${Cmd} | jq -r"
+    Cmd="${Cmd} --arg domain \"${Domain}\""
+    Cmd="${Cmd} --arg usr \"${User}\""
+    Cmd="${Cmd} '.[\$domain] | to_entries[] | select(.value.users[] | contains(\$usr)) | .key'"
+    # echo $Cmd  ### - FOR DEBUG ONLY
+    eval ${Cmd}
 }
 
-echo "Started ${0} ${*} ..."
-
 Domain=cvtt.vpn
+echo "Started ${0} ${*} ..."
+
 RootDir=${1}
 
 if [ ! -d "${RootDir}" ]; then
@@ -35,10 +35,12 @@ echo ${Cmd} && eval ${Cmd}
 for User in cvtt oleg
 do
     echo "User=$User"
+    Cmd="mkdir -p ${RootDir}/${User}"
+    echo ${Cmd} && eval ${Cmd}
+
     hosts=$(get_user_hosts ${User} ${Domain})
-    mkdir -p ${RootDir}/${User}
-    print ${hosts}
-    exit
+    echo ${hosts}
+
     for host in ${hosts}
     do
         echo "===================="
diff --git a/release_version.txt b/release_version.txt
index 1892b92..31e5c84 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-1.3.2
+1.3.3