internet reverse reorder and keep unique (fixes #2137)

treehouses · Mar 26, 2021 · 06d7fd0 · 06d7fd0
1 parent e6f025c
commit 06d7fd0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/modules/internet.sh b/modules/internet.sh
@@ -15,12 +15,13 @@ function internet {
     fi
     info="$(curl -s ipinfo.io | grep -o '"[^"]*"\s*:\s*"[^"]*"')"
     echo "$info" | grep -E '"(ip)"'
+    echo "$info" | grep -E '"(org)"'
     if ! echo "$info" | grep -E 'postal'; then
-      echo "$info" | grep -E '"(city|country)"' | tr '\n' ',' | sed 's/,$/, "postal": "n\/a"\n/' | sed 's/\",\"/\", \"/g'
+      echo "$info" | grep -E '"(country|city)"' | tr '\n' ',' | sed 's/,$/, "postal": "n\/a"\n/' | sed 's/\",\"/\", \"/g'
     else
-      echo "$info" | grep -E '"(city|country|postal)"' | tr '\n' ',' | sed 's/,$/\n/' | sed 's/\",\"/\", \"/g'
+      echo "$info" | grep -E '"(country|city|postal)"' | tr '\n' ',' | sed 's/,$/\n/' | sed 's/\",\"/\", \"/g'
     fi
-    echo "$info" | grep -E '"(org|timezone)"'
+    echo "$info" | grep -E '"(timezone)"'
     ;;
   *)
     log_help_and_exit1 "ERROR: incorrect command" internet