From 37f9798469b1240c131a83086986b7494b627e2a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 14 Nov 2004 22:54:11 +0000 Subject: Handle empty PATH too --- Echolot/Config.pm | 8 +++++--- NEWS | 4 ++-- debian/echolot.init | 3 +++ debian/echolot.postinst | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Echolot/Config.pm b/Echolot/Config.pm index 5ef4fda..547d812 100644 --- a/Echolot/Config.pm +++ b/Echolot/Config.pm @@ -316,9 +316,11 @@ sub check_binaries() { unless -x $path; } else { my $found = 0; - for my $pathelem (split /:/, $ENV{'PATH'}) { - $found = $pathelem, last - if -e $pathelem.'/'.$path; + if (defined $ENV{'PATH'}) { + for my $pathelem (split /:/, $ENV{'PATH'}) { + $found = $pathelem, last + if -e $pathelem.'/'.$path; + }; }; if ($found) { Echolot::Log::warn ("$bin binary $found/$path is not executeable") diff --git a/NEWS b/NEWS index 9708477..85447fc 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,8 @@ Changes in version - script * debian: Create echolot user group in proper gid space. * debian: remove debconf stuff. - * handle empty environment better - we would whine when - HOME is not set previously. + * handle empty environment better - previously we would whine + when HOME or PATH were not set. Changes in version 2.1.6 - 2004-08-07 * Catch a possible use of undefined values in a log trace() call. diff --git a/debian/echolot.init b/debian/echolot.init index 50fcabc..fc14c63 100755 --- a/debian/echolot.init +++ b/debian/echolot.init @@ -20,6 +20,9 @@ DESC="Echolot Ping Daemon" NAME="pingd" test -f $DAEMON || exit 0 +PATH=/bin:/usr/bin:/sbin:/usr/sbin +export PATH + # Reads config file (will override defaults above) [ -r /etc/default/echolot ] && . /etc/default/echolot diff --git a/debian/echolot.postinst b/debian/echolot.postinst index 28edcb2..b638d88 100755 --- a/debian/echolot.postinst +++ b/debian/echolot.postinst @@ -34,6 +34,7 @@ if [ "$1" = "configure" ] && [ -e /usr/share/debconf/confmodule ]; then if dpkg --compare-versions "$2" lt "2.1.7" ; then . /usr/share/debconf/confmodule db_purge + db_stop fi fi -- cgit v1.2.3