Merge pull request yjajkiew#3 from alberto743/portability+fallback

Assure the portability of the shebang. Prevent curl hanging in case o…

Author: yjajkiew

dynhost.sh

@@ -1,38 +1,29 @@
-#/bin/sh
-
-#
-# CONFIG
-#
+#!/usr/bin/env sh
 
+# Account configuration
 HOST=DOMAINE_NAME
 LOGIN=LOGIN
 PASSWORD=PASSWORD
 
-PATH_LOG=/var/log/dynhost
-CURRENT_DATE=`date`
-
-#
-# GET IPs
-#
+PATH_LOG=/var/log/dynhostovh.log
 
-HOST_IP=`dig +short $HOST`
-CURRENT_IP=`curl -4 ifconfig.co`
+# Get current IPv4 and corresponding configured
+HOST_IP=$(dig +short $HOST A)
+CURRENT_IP=$(curl -m 5 -4 ifconfig.co 2>/dev/null)
+if [ -z $CURRENT_IP ]
+then
+  CURRENT_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
+fi
+CURRENT_DATETIME=$(date -R)
 
-#
-# DO THE WORK
-#
+# Update dynamic IPv4, if needed
 if [ -z $CURRENT_IP ] || [ -z $HOST_IP ]
 then
-        echo "No IP retrieved" >> $PATH_LOG
+  echo "[$CURRENT_DATETIME]: No IP retrieved" >> $PATH_LOG
 else
-        if [ "$HOST_IP" != "$CURRENT_IP" ]
-        then
-                echo "$CURRENT_DATE"": Current IP:" "$CURRENT_IP" "and" "host IP:" "$HOST_IP" "   IP has changed!" >> $PATH_LOG
-                RES=`curl --user "$LOGIN:$PASSWORD" "https://www.ovh.com/nic/update?system=dyndns&hostname=$HOST&myip=$CURRENT_IP"`
-                echo "Result request dynHost:" >> $PATH_LOG
-                echo "$RES" >> $PATH_LOG
-        else
-                echo "$CURRENT_DATE"": Current IP:" "$CURRENT_IP" "and" "Host IP:" "$HOST_IP" "   IP has not changed" >> $PATH_LOG
-        fi
+  if [ "$HOST_IP" != "$CURRENT_IP" ]
+  then
+    RES=$(curl -m 5 --user "$LOGIN:$PASSWORD" "https://www.ovh.com/nic/update?system=dyndns&hostname=$HOST&myip=$CURRENT_IP")
+    echo "[$CURRENT_DATETIME]: IPv4 has changed - request to OVH DynHost: $RES" >> $PATH_LOG
+  fi
 fi
-