Remove some bashisms from network, even though we cannot convert it

Since netfs and network source rc.conf, we cannot fully convert it to an sh
script. However, we can get rid of a few things that are not sh compatible.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 7 insertions, 5 deletions

diff --git a/netfs b/netfs
index c381594..25db4e1 100755
--- a/netfs
+++ b/netfs
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# sourcing our current rc.conf requires this to be a bash script
 . /etc/rc.conf
 . /etc/rc.d/functions
 
diff --git a/network b/network
index fbe77d8..81996ef 100755
--- a/network
+++ b/network
@@ -30,7 +30,8 @@ ifup()
 	eval ifcfg="\$${1}"
 	if [ "$ifcfg" = "dhcp" ]; then
 		# remove the .pid file if it exists
-		rm -f /var/run/dhcpcd-${1}.{pid,cache} >/dev/null 2>&1
+		rm -f /var/run/dhcpcd-${1}.pid >/dev/null 2>&1
+		rm -f /var/run/dhcpcd-${1}.cache >/dev/null 2>&1
 		/sbin/dhcpcd $DHCPCD_ARGS ${1}
 	else
 		/sbin/ifconfig $ifcfg
@@ -59,9 +60,9 @@ iflist()
 {
 	for ifline in ${INTERFACES[@]}; do
 		if [ "$ifline" = "${ifline#!}" ]; then
-			echo -en " $ifline:\t"
+			printf " $ifline:\t"
 		else
-			echo -en "$ifline:\t"
+			printf "$ifline:\t"
 		fi
 		eval real_ifline=\$${ifline#!}
 		echo $real_ifline
@@ -94,9 +95,9 @@ rtlist()
 {
 	for rtline in ${ROUTES[@]}; do
 		if [ "$rtline" = "${rtline#!}" ]; then
-			echo -en " $rtline:\t"
+			printf " $rtline:\t"
 		else
-			echo -en "$rtline:\t"
+			printf "$rtline:\t"
 		fi
 		eval real_rtline=\$${rtline#!}
 		echo $real_rtline