ossp-pkg/shtool/sh.echo 1.24 -> 1.25
--- sh.echo 2001/01/17 09:55:11 1.24
+++ sh.echo 2001/06/13 08:54:50 1.25
@@ -141,8 +141,9 @@
fi
fi
-# determine host name
+# determine host and domain name
hostname=''
+domainname=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%h'`" != . ]; then
hostname="`(uname -n) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
@@ -160,9 +161,6 @@
;;
esac
fi
-
-# determine domain name
-domainname=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
if [ ".$domainname" = . ]; then
if [ -f /etc/resolv.conf ]; then
|
|
