From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 25 Jan 2018 00:16:00 +0000 (+0000)
Subject: etc/profile.d/functions
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=0077b9ebb84552737668210caa7bf0552e06bbb5;p=nb.git

etc/profile.d/functions
---

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 480f566e..0c6f7d88 100644
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -772,9 +772,11 @@ file_user() {
 
 myip() {
 	local url='';
-	for url in http://ipinfo.io/ip http://www.ipchicken.com http://icanhazip.com http://ident.me http://nicolas.boisselier.free.f/myip/;
+	for url in http://nbdom.net/myip http://nicolas.boisselier.free.fr/myip/ http://ipinfo.io/ip http://www.ipchicken.com http://icanhazip.com http://ident.me
 	do
-		http_get "$url" | perl -ne 'print "$1\n" and exit 64 if /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/';
+		http_get "$url" 2> /dev/null | awk 'match($0, /([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/) {print substr($0, RSTART, RLENGTH); exit 64}'
+		#http_get "$url" | sed -n '/\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}/p; q' | awk '{print $1}' | head -1
+		#http_get "$url" | perl -ne 'print "$1\n" and exit 64 if /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/';
 		[ "$?" == "64" ] && return 0;
 	done;
 	return 1
@@ -785,7 +787,7 @@ http_get() {
 		curl -sk $*
 
 	elif which wget 1>/dev/null; then
-		wget -O - --quiet --no-verbose --no-check-certificate --timeout 5 --tries 1 $*
+		wget -O - --quiet --no-verbose --no-check-certificate --timeout 10 --tries 1 $*
 
 	elif which lynx 1>/dev/null; then
 		lynx --source -dump $*