From cadaec7a094b3df89ca3442f7b94ce0bd59cab3b Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Mon, 16 Jun 2014 17:43:20 +0200
Subject: update taken script

---
 commands/taken | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 commands/taken

(limited to 'commands/taken')

diff --git a/commands/taken b/commands/taken
old mode 100644
new mode 100755
index 0b7424e..b8beba6
--- a/commands/taken
+++ b/commands/taken
@@ -8,21 +8,21 @@
 # Inspired by foca / giles:
 # http://gilesbowkett.blogspot.com/2009/02/simple-bash-domain-availability.html
  
-trap 'exit 1' INT TERM EXIT
- 
 for d in $@;
 do
-if host $d | grep "NXDOMAIN" >&/dev/null; then
-    if whois $d | grep -Ei "(No match|NOT FOUND|Status: free)" >&/dev/null; then
+if host "$d" | grep "NXDOMAIN" >&/dev/null; then
+    w=$(whois "$d")
+    if ! test "$?" -eq 0 ;then
+        echo "$d - whois not available"
+    elif echo "$w" | grep -Ei "(No match|NOT FOUND|Status: free)" >&/dev/null; then
         echo "$d available";
+    elif echo "$w"| grep -Ei "(Status: invalid)" >&/dev/null ;then
+        echo "$d invalid"
     else
-        if whois $d >&/dev/null;then
-            echo "$d taken";
-        else
-            echo "$d - whois not available"
-        fi
+        echo "$d taken";
     fi
 else
     echo "$d taken";
 fi
 done
+exit 0
-- 
cgit v1.2.3