From 84a273cfaed391a8008396e595cc1fa347aa2a5c Mon Sep 17 00:00:00 2001
From: Nick Daly <myownlittlworld@hotmail.com>
Date: Sat, 6 Jun 2009 22:19:17 -0500
Subject: Installer doesn't crash when installing BG2-SOA.

Still not sure how if it works though.
---
 auto-installer.sh | 83 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 40 deletions(-)

(limited to 'auto-installer.sh')

diff --git a/auto-installer.sh b/auto-installer.sh
index beffa06..475fc09 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -44,52 +44,55 @@ get_game
 [ -d "$TARGETDIR" ] && export alwaysdiesafely=1
 
 echo "$FULLGAMENAME detected, installing"
-"${scriptdir}/${MINSCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
+# "${scriptdir}/${MINSCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
 
-if [ -n "$EXTRASCRIPT" ]; then
-	if query "Do you want to do a full install, so the CDs will not be needed again?" y; then
-		FULLINSTALL=1
-		"${scriptdir}/${EXTRASCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
-	else
-		FULLINSTALL=0
-	fi
-fi
+# if [ -n "$EXTRASCRIPT" ]; then
+# 	if query "Do you want to do a full install, so the CDs will not be needed again?" y; then
+# 		FULLINSTALL=1
+# 		"${scriptdir}/${EXTRASCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
+# 	else
+# 		FULLINSTALL=0
+# 	fi
+# fi
 
-if [ -n "$EXPANSIONSCRIPT" && "$FULLINSTALL" -eq 0 ]; then
-    if query "Do you want to install the files needed by the expansion $EXPANSIONNAME?" y; then
-		EXPANSIONINSTALL=1
-		"${scriptdir}/${EXPANSIONSCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
-    else
-		EXPANSIONINSTALL=0
-    fi
-fi
+# if [ "$FULLINSTALL" -eq 0 ]; then
+#     if [ -n "$EXPANSIONSCRIPT" ]; then
+#         if query "Do you want to install the files needed by the $EXPANSIONNAME expansion?" y; then
+# 		    EXPANSIONINSTALL=1
+# 		    "${scriptdir}/${EXPANSIONSCRIPT}" -i "$TARGETDIR" -c "$CDMOUNT" "1>/dev/null" # || diequietly
+#         else
+# 		    EXPANSIONINSTALL=0
+#         fi
+#     fi
+# fi
 
+# if [ -n "$PATCHES" ]; then
+# 	for patch in "$PATCHES"; do
+# 		patch="$scriptdir/$patch"
+# 		# grab 17th line from scripts (description line; after license)
+# 		patchtitle=$(sed -n 17p "$patch"|cut -d ' ' -f 2-)
+# 		if query "Do you want to install $patchtitle" y; then
+# 			"$patch" \
+# 			-i "$TARGETDIR" \
+# 			-p "$PATCHDIR" \
+# 			-l "$LANGUAGE" \
+# 			-c "$CDMOUNT" \
+# 			1>/dev/null
+# 		fi
+# 	done
+# fi
 
-if [ -n "$PATCHES" ]; then
-	for patch in "$PATCHES"; do
-		patch="$scriptdir/$patch"
-		# grab 17th line from scripts (description line; after license)
-		patchtitle=$(sed -n 17p "$patch"|cut -d ' ' -f 2-)
-		if query "Do you want to install $patchtitle" y; then
-			"$patch" \
-			-i "$TARGETDIR" \
-			-p "$PATCHDIR" \
-			-l "$LANGUAGE" \
-			-c "$CDMOUNT" \
-			1>/dev/null
-		fi
-	done
-fi
-
-if [ -n "$WINDOWSFILES" ]; then
-	if query "Do you want to remove unneeded windows files?" n; then
-		for badfile in "$WINDOWSFILES"; do
-			rm -rf "${TARGETDIR}/${badfile}"
-		done
-	fi
-fi
+# if [ -n "$WINDOWSFILES" ]; then
+# 	if query "Do you want to remove unneeded windows files?" n; then
+# 		for badfile in "$WINDOWSFILES"; do
+# 			rm -rf "${TARGETDIR}/${badfile}"
+# 		done
+# 	fi
+# fi
 
 echo
 echo "$FULLGAMENAME installed successfully"
 
+export
+echo "cdno" $CDNO
 recommendcfg $CDNO
-- 
cgit v1.2.3