Style.

1 files changed, 31 insertions, 31 deletions

diff --git a/init.d/wscons.in b/init.d/wscons.in
index 15e5b56b..e5dfaa02 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -1,5 +1,5 @@
 #!@PREFIX@/sbin/runscript
-# Copyright 2008 Roy Marples <roy@marples.name>
+# Copyright 2008-2009 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
 depend()
@@ -19,82 +19,82 @@ start()
 	#	screen idx scr emul
 	#	font   name width height enc file
 	while read type arg1 arg2 arg3 arg4 arg5; do
-		case "${type}" in
+		case "$type" in
 			\#*|"")
 				continue
 				;;
 
 			font)
-				cmd=${wsfld}
-				[ "${arg2}" != "-" ] && cmd="${cmd} -w ${arg2}"
-				[ "${arg3}" != "-" ] && cmd="${cmd} -h ${arg3}" 
-				[ "${arg4}" != "-" ] && cmd="${cmd} -e ${arg4}"
-				cmd="${cmd} -N ${arg1} ${arg5}"
-				eval "${cmd}"				
+				cmd=$wsfld
+				[ "$arg2" != "-" ] && cmd="$cmd -w $arg2"
+				[ "$arg3" != "-" ] && cmd="$cmd -h $arg3" 
+				[ "$arg4" != "-" ] && cmd="$cmd -e $arg4"
+				cmd="$cmd -N $arg1 $arg5"
+				eval "$cmd"				
 				;;
 
 			screen)
-				cmd=${wscfg}
-				[ "${arg2}" != "-" ] && cmd="${cmd} -t ${arg2}"
-				[ "${arg3}" != "-" ] && cmd="${cmd} -e ${arg3}"
-				cmd="${cmd} ${arg1}"
-				eval "${cmd}"
+				cmd=$wscfg
+				[ "$arg2" != "-" ] && cmd="$cmd -t $arg2"
+				[ "$arg3" != "-" ] && cmd="$cmd -e $arg3"
+				cmd="$cmd $arg1"
+				eval "$cmd"
 				;;
 
 			keyboard)
-				cmd=${wscfg}
-				case "${arg1}" in
+				cmd=$wscfg
+				case "$arg1" in
 					-|auto)
-						cmd="${cmd} -k"
+						cmd="$cmd -k"
 						;;
 					*)
-						cmd="${cmd} -k ${arg1}"
+						cmd="$cmd -k $arg1"
 						;;
 				esac
-				${cmd}
+				$cmd
 				;;
 
 			encoding)
-				eval ${wsctl} -w "\"encoding=${arg1}\""
+				eval $wsctl -w "\"encoding=$arg1\""
 				;;
 
 			mapfile)
 				local entry=
 				while read entry; do
-					case "${entry}" in
+					case "$entry" in
 					\#*|"")
 						continue
 						;;
 					*)
-						cmd="${wsctl} -w \"map+=${entry}\""
-						eval "${cmd} >/dev/null"
+						cmd="$wsctl -w \"map+=$entry\""
+						eval "$cmd >/dev/null"
 						;;
 					esac
-				done < "${arg1}"
+				done < "$arg1"
 				;;
 
 			mux)
-				eval "${wscfg} -m ${arg1}"
+				eval "$wscfg -m $arg1"
 				;;
 
 			setvar)
-				case "${arg1}" in
+				case "$arg1" in
 				keyboard)
-					cmd="${wsctl} -kw ${arg2}"
+					cmd="$wsctl -kw $arg2"
 					;;
 				display)
-					cmd="${wsctl} -dw ${arg2}"
+					cmd="$wsctl -dw $arg2"
 					;;
 				mouse)
-					cmd="${wsctl} -mw ${arg2}"
+					cmd="$wsctl -mw $arg2"
 					;;
 				*)
-					cmd="${wsctl} -w ${arg1}"
+					cmd="$wsctl -w $arg1"
 					;;
 				esac
-				eval "${cmd}"
+				eval "$cmd"
 				;;
 
 		esac
-	done < "${config}"
+	done < "$config"
 }