X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=chost;h=a26529fee9efbeaf3a14632946d59d4e84d7bc8d;hb=845c2b9e9e7e25b3dfa3d7f750d0acae0e50caf4;hp=9a0034f120db7e94ee0377f4f5b98c27ea19f4ce;hpb=afabe0c27af744200aa6b6e05c5b2ab7d7518c1e;p=automated-distro-installer

diff --git a/chost b/chost
index 9a0034f..a26529f 100755
--- a/chost
+++ b/chost
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright (C) 2016 Ian Kelling
 
 # chost: get canonical hostname
 
@@ -6,8 +7,9 @@ set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 host=$1
-addr=$(host $host)
-addr=${addr##* }
+# ||: because if we are using 2+ resolvers, 1 may fail, causing error, but we still get
+# a valid address and we just use that
+addr=$(host $host | sed -rn 's/^\S+ has address //p;T;q' ||:)
 h=$(host $addr)
 h=${h##* }
-echo ${h%%.*}
+echo $h