--- trunk/distcc/distcc-config.sh	2007/05/08 20:06:05	144
+++ trunk/distcc/distcc-config.sh	2009/12/01 10:41:10	943
@@ -1,10 +1,9 @@
 #!/bin/bash
-#distcc-config bash
+# distcc-config bash
 
-#needed variables
+# needed variables
 ENVFILE="/etc/env.d/02distcc"
 
-
 print_usage()
 {
 	echo
@@ -24,26 +23,26 @@
 do
 	case "$opt" in
 		
-		#sets hosts
+		# sets hosts
 		s)
 			[ ! -d /etc/distcc ] && install -d /etc/distcc
 			echo "${OPTARG}" > /etc/distcc/hosts
 			exit 0
 			;;
 			
-#		#sets logfile
+#		# sets logfile
 #       	l)
 #			echo ${OPTARG}
 #			exit 0
 #			;;
 #		
-#		#set verbose
+#		# set verbose
 #		v)
 #			echo ${OPTARG}
 #			exit 0
 #			;;
 			
-		#print config
+		# print config
 		p)
 			echo "Configured hosts:"
 			declare -i x=0
@@ -60,11 +59,15 @@
 			     [ "$(stat -c %s /etc/distcc/hosts)" -ne 0 ]
 			then
 				echo "     /etc/distcc/hosts:"
-				for i in $(cat /etc/distcc/hosts)
+				(cat /etc/distcc/hosts; echo) | # make sure there is a LF at the end
+				while read line
 				do
+					case "${line}" in
+						\#*|"") continue ;;
+					esac
 					((x++))
-					echo "                   ${x}. ${i}"
-				done
+					echo "                   ${x}. ${line}"
+				done < /etc/distcc/hosts
 			else
 				echo "     None. Please run distcc-config."
 				echo "     e.g. distcc-config -s \"host1 host2\""
@@ -72,8 +75,8 @@
 			echo
 			exit 0
 			;;
-		
-		#install compiler symlinks
+
+		# install compiler symlinks
 		i)
 			source /etc/mage.rc
 			for file in gcc cc c++ g++
@@ -98,18 +101,18 @@
 			done
 			exit 0
 			;;
-			
+
 		#show help
 		h)
 			print_usage
 			exit 0
 			;;
-			
-        	-)
+
+		-)
 			break
 			;;
 			
-	        *)
+		*)
 			echo "Run '/usr/bin/distcc-config -h' for help." 1>&2
 			exit 1
 			;;