Subject: Using $HOST rather than $HOSTNAME to avoid false positive in checkbashisms.

From: Daniel Baumann <[email-masked]>
Date: Tue, 12 Aug 2008 16:30:41 +0200

---
 examples/cron/manpages.sh  | 5 +++--
 examples/cron/snapshots.sh | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/cron/manpages.sh b/examples/cron/manpages.sh
index da58d94..00f49df 100755
--- a/examples/cron/manpages.sh
+++ b/examples/cron/manpages.sh
@@ -9,6 +9,7 @@ TEMPDIR="/srv/tmp/manpages"
 SERVER="/srv/debian-live/www/other/manpages"
 
 DATE_START="$(date -R)"
+HOST="$(hostname)"
 
 # Checking lock file
 if [ -f "${SERVER}"/lock ]
@@ -29,7 +30,7 @@ trap "test -f ${SERVER}/lock && rm -f ${SERVER}/lock; exit 0" 0 HUP INT QUIT KIL
 # Creating lock file
 echo "${DATE_START}" > "${SERVER}"/lock
 
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper: begin manpage build." >> /var/log/live
+echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: begin manpage build." >> /var/log/live
 
 # Remove old manpages
 rm -f "${SERVER}"/*.html
@@ -96,4 +97,4 @@ EOF
 # Removing build directory
 rm -rf "${TEMPDIR}"
 
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper: end manpage build." >> /var/log/live
+echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: end manpage build." >> /var/log/live
diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh
index c2a82c0..3a702c4 100755
--- a/examples/cron/snapshots.sh
+++ b/examples/cron/snapshots.sh
@@ -21,6 +21,7 @@ SERVER="/mnt/daniel1/srv/debian-unofficial/live/debian"
 LOGFILE="${SERVER}/build.log"
 
 DATE_START="$(date -R)"
+HOST="$(hostname)"
 
 # Checking lock file
 if [ -f "${SERVER}"/Archive-Update-in-Progress ]
@@ -41,7 +42,7 @@ trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Up
 # Creating lock file
 echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
 
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-snapshots: begin build." >> "${LOGFILE}"
+echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-snapshots: begin build." >> "${LOGFILE}"
 
 # Processing packages
 for PACKAGE in ${PACKAGES}
@@ -179,4 +180,4 @@ rm -rf "${TEMPDIR}"
 chmod 0644 "${SERVER}"/*
 chmod 0766 "${SERVER}"/*.sh
 
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-snapshots: end build." >> "${LOGFILE}"
+echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-snapshots: end build." >> "${LOGFILE}"
-- 
cgit v1.0