Skip to content

Commit

Permalink
update tools/checkdomains.sh
Browse files Browse the repository at this point in the history 
- fix expiry date detection as different whois servers return slightly different format
  • Loading branch information
@centminmod
centminmod committed Aug 29, 2017
1 parent 194136d commit bfc664c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions tools/checkdomains.sh
View file
Expand Up @@ -65,15 +65,15 @@ for d in ${OTHERDOMAINS[@]}; do
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down Expand Up @@ -122,15 +122,15 @@ for d in ${OTHERDOMAINS[@]}; do
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down Expand Up @@ -194,15 +194,15 @@ for d in ${OTHERDOMAINS[@]}; do
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down Expand Up @@ -258,15 +258,15 @@ if [[ "$CHECKDOMAINS_DEBUG" != [yY] ]]; then
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down Expand Up @@ -315,15 +315,15 @@ if [[ "$CHECKDOMAINS_DEBUG" != [yY] ]]; then
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down Expand Up @@ -387,15 +387,15 @@ if [[ "$CHECKDOMAINS_DEBUG" != [yY] ]]; then
fi
elif [[ "$tld" = 'au' && "$ctoplevel" = 'com.au' ]]; then
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Last Modified:/ {print $2}' "${CTMPDIR}/${d}.txt")
fi
else
if [[ "$WHOIS_SHOWREGISTRANT" = [yY] ]]; then
whoisdate=$(awk -F ": " '/Expiration Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisdate=$(awk -F ": " '/Expiration Date:|Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
whoisupdate=$(awk -F ": " '/Updated Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
else
whoisdate=$(awk -F ": " '/Expiry Date:/ {print $2}' "${CTMPDIR}/${d}.txt")
Expand Down

0 comments on commit bfc664c

Please sign in to comment.