From 2646587533a59bbaea6f05c178e8334092dd3fd6 Mon Sep 17 00:00:00 2001 From: JLKwong Date: Thu, 25 Mar 2021 21:29:54 -0700 Subject: [PATCH] update remote reverse (fixes #2137) --- modules/remote.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/remote.sh b/modules/remote.sh index 6d3a2a2f69..502e060fa7 100644 --- a/modules/remote.sh +++ b/modules/remote.sh @@ -75,12 +75,12 @@ function remote { while IFS= read -r line; do cmd_str+="\"$line\"," done <<< "$reverse" - ip=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 1) - org=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 5) - country=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 4) - city=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 3) - postal=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 2) - timezone=$(printf "%s\n" "${cmd_str::-1}" | cut -d',' -f 6) + ip=$(printf "%s\n" "${cmd_str::-1}" | grep -e '"ip": "') + org=$(printf "%s\n" "${cmd_str::-1}" | grep -e '"org": "') + country=$(printf "%s\n" "${cmd_str::-1}" | grep -o '"country": "[^;]*') + city=$(printf "%s\n" "${cmd_str::-1}" | grep -o '"city": "[^;]*') + postal=$(printf "%s\n" "${cmd_str::-1}" | grep -o '"postal": "[^;]*') + timezone=$(printf "%s\n" "${cmd_str::-1}" | grep -o '"timezone": "[^;]*') echo "{$ip,$org,$country,$city,$postal,$timezone}" ;;