From c3ed03e865dd39e6c14f291c5fe1aa4d719c3678 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Mon, 5 Aug 2024 17:38:12 -0400 Subject: [PATCH] hjson and jq in bash --- cronjobs/save_cronjobs.sh | 23 +++++++++++++++++------ release_version.txt | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/cronjobs/save_cronjobs.sh b/cronjobs/save_cronjobs.sh index 248fbd4..894e1f0 100755 --- a/cronjobs/save_cronjobs.sh +++ b/cronjobs/save_cronjobs.sh @@ -5,6 +5,20 @@ 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} + + get_hosts_json | jq -r \ + --arg domain "${Domain}" \ + --arg usr "${User}" \ + '.[$domain] | to_entries[] | select(.value.users[] | contains($usr)) | .key' +} + echo "Started ${0} ${*} ..." Domain=cvtt.vpn @@ -21,13 +35,10 @@ echo ${Cmd} && eval ${Cmd} for User in cvtt oleg do echo "User=$User" - hosts=$( - curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts | jq -r \ - --arg domain "${Domain}" \ - --arg usr "${User}" \ - '.[$domain] | to_entries[] | select(.value.users[] | contains($usr)) | .key' - ) + hosts=$(get_user_hosts ${User} ${Domain}) mkdir -p ${RootDir}/${User} + print ${hosts} + exit for host in ${hosts} do echo "====================" diff --git a/release_version.txt b/release_version.txt index 3a3cd8c..1892b92 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.3.1 +1.3.2