Solaris' test binary (test/[) doesn't grok "-e". Replace with "-f".

Noted by Stoned Elipot <seb@netbsd.org> in private email.

5 files changed, 16 insertions, 16 deletions

diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
index d87cf7df128..f4185b24e3a 100644
--- a/sysutils/ups-nut/files/ups.sh
+++ b/sysutils/ups-nut/files/ups.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: ups.sh,v 1.6 2002/01/10 12:01:38 jlam Exp $
+# $NetBSD: ups.sh,v 1.7 2002/02/05 06:04:41 jlam Exp $
 #
 # KEYWORD: nostart
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -39,7 +39,7 @@ stop_cmd="reverse_commands"
 status_cmd="forward_commands"
 extra_commands="status"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
         run_rc_command "$1"
 else
diff --git a/sysutils/ups-nut/files/upsd.sh b/sysutils/ups-nut/files/upsd.sh
index 29ef15c9ff0..4ff7babc204 100644
--- a/sysutils/ups-nut/files/upsd.sh
+++ b/sysutils/ups-nut/files/upsd.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: upsd.sh,v 1.2 2001/11/21 21:38:55 jlam Exp $
+# $NetBSD: upsd.sh,v 1.3 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upsd
 # REQUIRE: upsdriver
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command="@PREFIX@/sbin/${name}"
 required_files="@NUT_CONFDIR@/${name}.conf"
 pidfile="@NUT_STATEDIR@/${name}.pid"
 
-if [ -e /etc/rc.d ]
+if [ -f /etc/rc.d ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh
index aade6a5f877..485fa6a9214 100644
--- a/sysutils/ups-nut/files/upsdriver.sh
+++ b/sysutils/ups-nut/files/upsdriver.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: upsdriver.sh,v 1.4 2002/01/08 18:33:36 jlam Exp $
+# $NetBSD: upsdriver.sh,v 1.5 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upsdriver
 # REQUIRE: NETWORK syslogd mountcritremote
@@ -16,7 +16,7 @@
 # drivers.  Please refer to nutupsdrv(8) for more information about the
 # arguments to pass to the UPS drivers.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -24,7 +24,7 @@ fi
 name="upsdriver"
 rcvar=$name
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 fi
@@ -44,7 +44,7 @@ else
 	#pidfile="@NUT_STATEDIR@/${upsdriver_type}-${tty}.pid"
 fi
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	run_rc_command "$1"
 else
diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh
index 56023203b43..e3ba90f0798 100644
--- a/sysutils/ups-nut/files/upslog.sh
+++ b/sysutils/ups-nut/files/upslog.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: upslog.sh,v 1.3 2002/01/08 18:33:17 jlam Exp $
+# $NetBSD: upslog.sh,v 1.4 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upslog
 # REQUIRE: upsd
@@ -14,7 +14,7 @@
 # Please refer to upslog(8) for more information about the arguments to pass
 # to upslog.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -24,7 +24,7 @@ rcvar="${name}"
 command="@PREFIX@/bin/${name}"
 pidfile="/var/run/${name}.pid"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh
index 338fcbba5c2..8d4c946c938 100644
--- a/sysutils/ups-nut/files/upsmon.sh
+++ b/sysutils/ups-nut/files/upsmon.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: upsmon.sh,v 1.2 2001/11/21 21:38:55 jlam Exp $
+# $NetBSD: upsmon.sh,v 1.3 2002/02/05 06:04:42 jlam Exp $
 #
 # PROVIDE: upsmon
 # REQUIRE: upsd
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="@NUT_CONFDIR@/${name}.conf"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"