From 551610e89294164156e1b0787f9be9220dfc6b6e Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Sun, 17 May 2009 15:29:25 +0100
Subject: Correct and simplify config recommendation

---
 includes/autoinstall-includes.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/includes/autoinstall-includes.sh b/includes/autoinstall-includes.sh
index 7ee3024..76e8638 100644
--- a/includes/autoinstall-includes.sh
+++ b/includes/autoinstall-includes.sh
@@ -74,7 +74,7 @@ function recommendcfg
 	if [ "$1" ]; then
 		NUMOFCDS=$1
 	else
-		NUMOFCDS=0
+		NUMOFCDS=1
 	fi
 
 	echo
@@ -83,22 +83,16 @@ function recommendcfg
 	echo
 	LINE="GamePath=$TARGETDIR"; echo $LINE
 	if [ $FULLINSTALL -eq 1 ]; then
-		LINE="CD1=$TARGETDIR"; echo $LINE
-		if [ $NUMOFCDS -gt 0 ]; then
-			for CDNUMBER in $(seq 2 $NUMOFCDS); do
-				LINE="CD$CDNUMBER=$TARGETDIR"
-				echo $LINE
-			done
-		fi
+		for CDNUMBER in $(seq $NUMOFCDS); do
+			LINE="CD$CDNUMBER=$TARGETDIR"
+			echo $LINE
+		done
 		echo "GameOnCD=0"
 	else
-		LINE="CD1=$CDMOUNT"; echo $LINE
-		if [ $NUMOFCDS -gt 0 ]; then
-			for CDNUMBER in $(seq 2 $NUMOFCDS); do
-				LINE="CD$CDNUMBER=$CDMOUNT/cd$CDNUMBER"
-				echo $LINE
-			done
-		fi
+		for CDNUMBER in $(seq $NUMOFCDS); do
+			LINE="CD$CDNUMBER=$CDMOUNT/cd$CDNUMBER"
+			echo $LINE
+		done
 		echo "GameOnCD=1"
 	fi
 }
-- 
cgit v1.2.3