From b88c95b4f35338a13505735c0b02d238ca5ef8fe Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Thu, 8 Sep 2022 21:18:03 -0600 Subject: [PATCH] Cleanup and shellchecks --- back/lib/wg_user_list | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/back/lib/wg_user_list b/back/lib/wg_user_list index a512519..bb48b06 100755 --- a/back/lib/wg_user_list +++ b/back/lib/wg_user_list @@ -21,12 +21,11 @@ source "${CONFIG_FILE}" domain="$("${LIB_DIR}/ns_lookup_rdns" "${ipv4}")" || exit 4 username="$(<<<"${domain}" cut -d'.' -f2)" hostname="$(<<<"${domain}" cut -d'.' -f1)" - if [ "${2}" == 'json' ]; then - #TODO Remove keys with empty ("") values - printf '{"domain":"%s.%s.%s","ipv4":"%s","ipv6":"%s","pubkey":"%s}"},' \ - "${hostname}" "${username}" "${TLD}" "${ipv4}" "${ipv6}" "${pubkey}" - elif [ "${2}" == 'tsv' ]; then - printf '%s.%s.%s\t%s\t%s\t%s\n' \ - "${hostname}" "${username}" "${TLD}" "${ipv4}" "${ipv6}" "${pubkey}" + case "${2}" in + #TODO Remove json keys with empty ("") values + 'json') printf '{"domain":"%s.%s.%s","ipv4":"%s","ipv6":"%s","pubkey":"%s}"},' \ + "${hostname}" "${username}" "${TLD}" "${ipv4}" "${ipv6}" "${pubkey}"; + *) printf '%s.%s.%s\t%s\t%s\t%s\n' \ + "${hostname}" "${username}" "${TLD}" "${ipv4}" "${ipv6}" "${pubkey}";; fi done | sed 's/,$//' # Remove trailing comma from json