diff --git a/scripts/clientStat.sh b/scripts/clientStat.sh index 834b0dd..6a5ff97 100644 --- a/scripts/clientStat.sh +++ b/scripts/clientStat.sh @@ -2,6 +2,11 @@ # PiVPN: client status script STATUS_LOG="/var/log/openvpn-status.log" + +function hr() { + numfmt --to=iec-i --suffix=B "$1" +} + printf "\n" if [ ! -f "${STATUS_LOG}" ]; then echo "The file: $STATUS_LOG was not found!" @@ -15,7 +20,15 @@ printf "\e[1m::: Client Status List :::\e[0m\n" printf "\t\t\t\t\t\t\tBytes\t\tBytes\t\n" printf "\e[4mName\e[0m\t\t\e[4mRemote IP\e[0m\t\t\e[4mVirtual IP\e[0m\t\e[4mReceived\e[0m\t\e[4mSent\e[0m\t\t\e[4mConnected Since\e[0m \n" if grep -q "^CLIENT_LIST" "${STATUS_LOG}"; then - awk -F' ' -v s='CLIENT_LIST' '$1 == s {print $2"\t\t"$3"\t"$4"\t"$5"\t\t"$6"\t\t"$8" "$9" "$11" -- "$10}' ${STATUS_LOG} + if [ -n $(type -t numfmt) ]; then + while read -r line; do + read -r -a array <<< $line + [[ ${array[0]} = CLIENT_LIST ]] || continue + printf "%s\t\t%s\t%s\t%s\t\t%s\t\t%s %s %s - %s" ${array[1]} ${array[2]} ${array[3]} $(hr ${array[4]}) $(hr ${array[5]}) ${array[7]} ${array[8]} ${array[10]} ${array[9]} + done <$STATUS_LOG + else + awk -F' ' -v s='CLIENT_LIST' '$1 == s {print $2"\t\t"$3"\t"$4"\t"$5"\t\t"$6"\t\t"$8" "$9" "$11" - "$10}' ${STATUS_LOG} + fi else printf "\nNo Clients Connected!\n" fi