--- branches/mage-next/src/mkinfodir.in	2015/11/30 13:50:35	2915
+++ branches/mage-next/src/mkinfodir.in	2015/11/30 13:51:05	2916
@@ -46,11 +46,52 @@
   exit 1
 fi
 
+# sanity checks
+if [[ -x $(type -P date) ]]
+then
+	_DATE="$(date)"
+else
+	_DATE="unknown date"
+fi
+if [[ -x $(type -P whoami) ]]
+then
+	_WHOAMI="$(whoami)"
+else
+	if [[ -n ${USER} ]]
+	then
+		_WHOAMI="${USER}"
+	else
+		_WHOAMI="unknown user"
+	fi
+fi
+if [[ -x $(type -P hostname) ]]
+then
+	_HOSTNAME="$(hostname)"
+else
+	if [[ -n ${HOSTNAME} ]]
+	then
+		_HOSTNAME="${HOSTNAME}"
+	else
+		_HOSTNAME="unknown hostname"
+	fi
+fi
+if [[ -x $(type -P pwd) ]]
+then
+	_PWD="$(cd ${INFODIR}; pwd)"
+else
+	if [[ -n ${PWD} ]]
+	then
+		_PWD="$(cd ${INFODIR}; echo $PWD)"
+	else
+		_PWD="unknown directory"
+	fi
+fi
+
 ### output the dir header
 echo "-*- Text -*-"
 echo "This file was generated automatically by $0."
-echo "This version was generated on `date`"
-echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
+echo "This version was generated on ${_DATE}"
+echo "by ${_WHOAMI}@${_HOSTNAME} for ${_PWD}"
 
 cat << moobler
 \$Id: mkinfodir,v 1.7 2005-06-01 15:48:42 niro Exp $