Style clean-up:

	* All variables are now embraced: ${foo}

	* All comparisons against some value now take the form:
	  [ "${foo}" ? "value" ]
	  where ? is a comparison operator

	* All empty string tests now take the form:
	  [ -z "${foo}" ]

	* All non-empty string tests now take the form:
	  [ -n "${foo}" ]

Submitted by:	jkh

1 files changed, 23 insertions, 23 deletions

diff --git a/etc/etc.alpha/rc.alpha b/etc/etc.alpha/rc.alpha
index 1ab5f4c..26b0718 100644
--- a/etc/etc.alpha/rc.alpha
+++ b/etc/etc.alpha/rc.alpha
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.alpha,v 1.2 1998/08/31 08:57:56 dfr Exp $
+#	$Id: rc.alpha,v 1.3 1999/04/24 20:58:37 peter Exp $
 #	Do alpha specific processing
 #
 
@@ -18,63 +18,63 @@ viddev=/dev/ttyv0
 echo -n "rc.alpha configuring syscons:"
 
 # keymap
-if [ "X${keymap}" != X"NO" ]; then
+if [ "${keymap}" != "NO" ]; then
 	echo -n ' keymap';	kbdcontrol <${kbddev} -l ${keymap}
 fi
 
 # keyrate
-if [ "X${keyrate}" != X"NO" ]; then
+if [ "${keyrate}" != "NO" ]; then
 	echo -n ' keyrate';	kbdcontrol <${kbddev} -r ${keyrate}
 fi
 
 # keybell
-if [ "X${keybell}" != X"NO" ]; then
+if [ "${keybell}" != "NO" ]; then
 	echo -n ' keybell';	kbdcontrol <${kbddev} -b ${keybell}
 fi
 
 # change function keys
-if [ "X${keychange}" != X"NO" ]; then
+if [ "${keychange}" != "NO" ]; then
 	echo -n " keychange"
 	set - ${keychange}
 	while [ $# -gt 0 ]
 	do
-		kbdcontrol <${kbddev} -f "$1" "$2"
+		kbdcontrol < ${kbddev} -f "$1" "$2"
 		shift; shift
 	done
 fi
 
 # cursor type
-if [ "X${cursor}" != X"NO" ]; then
-	echo -n ' cursor';	vidcontrol <${viddev} -c ${cursor}
+if [ "${cursor}" != "NO" ]; then
+	echo -n ' cursor';	vidcontrol < ${viddev} -c ${cursor}
 fi
 
 # screen mapping
-if [ "X${scrnmap}" != X"NO" ]; then
-	echo -n ' screen_map';	vidcontrol <${viddev} -l ${scrnmap}
+if [ "${scrnmap}" != "NO" ]; then
+	echo -n ' screen_map';	vidcontrol < ${viddev} -l ${scrnmap}
 fi
 
 # font 8x16
-if [ "X${font8x16}" != X"NO" ]; then
-	echo -n ' font8x16';	vidcontrol <${viddev} -f 8x16 ${font8x16}
+if [ "${font8x16}" != "NO" ]; then
+	echo -n ' font8x16';	vidcontrol < ${viddev} -f 8x16 ${font8x16}
 fi
 
 # font 8x14
-if [ "X${font8x14}" != X"NO" ]; then
-	echo -n ' font8x14';	vidcontrol <${viddev} -f 8x14 ${font8x14}
+if [ "${font8x14}" != "NO" ]; then
+	echo -n ' font8x14';	vidcontrol < ${viddev} -f 8x14 ${font8x14}
 fi
 
 # font 8x8
-if [ "X${font8x8}" != X"NO" ]; then
-	echo -n ' font8x8';	vidcontrol <${viddev} -f 8x8 ${font8x8}
+if [ "${font8x8}" != "NO" ]; then
+	echo -n ' font8x8';	vidcontrol < ${viddev} -f 8x8 ${font8x8}
 fi
 
 # blank time
-if [ "X${blanktime}" != X"NO" ]; then
-	echo -n ' blank_time';	vidcontrol <${viddev} -t ${blanktime}
+if [ "${blanktime}" != "NO" ]; then
+	echo -n ' blank_time';	vidcontrol < ${viddev} -t ${blanktime}
 fi
 
 # screen saver
-if [ "X${saver}" != X"NO" ] ; then
+if [ "${saver}" != "NO" ] ; then
 	echo -n ' screensaver'
 	for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do
 		kldunload $i
@@ -83,18 +83,18 @@ if [ "X${saver}" != X"NO" ] ; then
 fi
 
 # mouse daemon
-if [ "X${moused_enable}" = X"YES" ] ; then
+if [ "${moused_enable}" = "YES" ] ; then
 	echo -n ' moused'
 	moused ${moused_flags} -p ${moused_port} -t ${moused_type}
-	vidcontrol <${viddev} -m on
+	vidcontrol < ${viddev} -m on
 fi
 
 # set this mode for all virtual screens
-if [ "X${allscreens_flags}" != X"" ] ; then
+if [ -n "${allscreens_flags}" ] ; then
 	echo -n ' allscreens'
 	for ttyv in /dev/ttyv*
 	do
-		vidcontrol <$ttyv ${allscreens_flags}
+		vidcontrol < ${ttyv} ${allscreens_flags}
 	done
 fi
 echo '.'