From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 14 May 2018 15:17:22 +0000 (+0100)
Subject: Merge branch 'testing'
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=4d7bf97d118c205f32e1b787ba0207e267bda010;p=nb.git

Merge branch 'testing'
---

4d7bf97d118c205f32e1b787ba0207e267bda010
diff --cc etc/profile.d/functions
index 3bb8c054,36b73824..ca658bea
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@@ -772,12 -725,11 +725,12 @@@ file_user() 
  
  myip() {
  	local url='';
- 	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
+ 	for url in http://nicolas.boisselier.free.fr/myip/ http://nbdom.net/myip http://ipinfo.io/ip http://www.ipchicken.com http://icanhazip.com http://ident.me
  	do
 -		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" 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" | perl -ne 'print "$1\n" and exit 64 if /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/';
 +		http_get "$url" | sed -n '/\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}/p; q' | awk '{print $1; exit 64}'
 +
  		[ "$?" == "64" ] && return 0;
  	done;
  	return 1