diff --git a/home/user/.local/bin/myip b/home/user/.local/bin/myip index e828eb1..37d0e2a 100755 --- a/home/user/.local/bin/myip +++ b/home/user/.local/bin/myip @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -m TAB="$(printf -- '\t')" @@ -6,20 +6,21 @@ readonly TAB execute_and_format_result() { - cmd="${@}" + cmd="${*}" - ip="$(${cmd} 2>/dev/null)" + #shellcheck disable=SC2086 + ip="$(timeout 2 ${cmd} 2>/dev/null)" printf "%s\t%s\n" "${ip}" "${cmd}" } if [ "${1}" = '--short' ]; then - curl ip.thek4n.ru + curl -L ip.thek4n.ru exit "${?}" fi { - execute_and_format_result curl ipinfo.io/ip - execute_and_format_result curl https://ip.thek4n.ru/ - execute_and_format_result dig +short myip.opendns.com @resolver1.opendns.com + execute_and_format_result curl ipinfo.io/ip & + execute_and_format_result curl https://ip.thek4n.ru/ & + execute_and_format_result dig +short myip.opendns.com @resolver1.opendns.com & } | column -t -s "${TAB}"