rse 99/06/29 06:49:14
Modified: src/helpers buildinfo.sh
Log:
Overtake also some fixes from GNU shtool for buildinfo.sh...
Revision Changes Path
1.9 +6 -6 apache-1.3/src/helpers/buildinfo.sh
Index: buildinfo.sh
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/buildinfo.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildinfo.sh 1999/04/21 14:30:26 1.8
+++ buildinfo.sh 1999/06/29 13:49:14 1.9
@@ -58,10 +58,10 @@
if [ "x$username" = "x" ]; then
username="$USER"
if [ "x$username" = "x" ]; then
- username="`whoami 2>/dev/null |\
+ username="`(whoami) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ "x$username" = "x" ]; then
- username="`who am i 2>/dev/null |\
+ username="`(who am i) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ "x$username" = "x" ]; then
username='unknown'
@@ -73,10 +73,10 @@
#
# determine hostname and domainname
#
-hostname="`uname -n 2>/dev/null |\
+hostname="`(uname -n) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ "x$hostname" = "x" ]; then
- hostname="`hostname 2>/dev/null |\
+ hostname="`(hostname) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ "x$hostname" = "x" ]; then
hostname='unknown'
@@ -115,8 +115,8 @@
if [ "x$time_year" = "x" ]; then
time_year="`date '+%y' | awk '{ printf("%s", $1); }'`"
case $time_year in
- 9[0-9]*) time_year="19$time_year" ;;
- *) time_year="20$time_year" ;;
+ [5-9][0-9]) time_year="19$time_year" ;;
+ [0-4][0-9]) time_year="20$time_year" ;;
esac
fi
case $time_month in
