From fe64019b96d68ef6520c5fa049d358fa8043d96b Mon Sep 17 00:00:00 2001
From: nick <nick@debian.hws.edu>
Date: Mon, 20 Apr 2009 20:42:50 -0500
Subject: Small tweaks to allow the 3CD TOTSC installer to succeed.

---
 auto-installer.sh            | 2 +-
 bg1/install-3cd-extra.sh     | 2 +-
 bg1/install-3cd-minimal.sh   | 4 ++--
 includes/generic-includes.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/auto-installer.sh b/auto-installer.sh
index 4295230..f6c7927 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -30,7 +30,7 @@ case "$CDMD5" in
 	"1a6828b97a27967e8c4acc25e1ef48d2" )
 		FULLGAMENAME="Baldurs Gate Tales of the Sword Coast: 3CD US version"
 		SHORTGAMENAME="bg1"
-		MINSCRIPT=totsc/install-3cd-minimal.sh
+		MINSCRIPT=bg1/install-3cd-minimal.sh
 		EXTRASCRIPT=bg1/install-3cd-extra.sh
 		PATCHES="bg1/install-patch-baldurdash-fix.sh bg1/install-patch-baldurdash-text.sh"
 		WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
diff --git a/bg1/install-3cd-extra.sh b/bg1/install-3cd-extra.sh
index a5d1b8e..871ebbe 100755
--- a/bg1/install-3cd-extra.sh
+++ b/bg1/install-3cd-extra.sh
@@ -12,7 +12,7 @@ copylower "$CDMOUNT/cd1/" "$TARGETDIR"
 getcd 2 c04758a6af171bf9a35d8e3d4dcd807c CD2/Movies/MovieCD2.bif
 copylower "$CDMOUNT/cd2/" "$TARGETDIR"
 copylower "$CDMOUNT/cd5/" "$TARGETDIR"
-cp $CDMOUNT/CD2/Manual/Baldur.pdf "$TARGETDIR"/manual || die
+cp $CDMOUNT/Manual/Baldur.pdf "$TARGETDIR"/manual || die
 
 getcd 3 ba4224f50f890e10561d22f602d6a991 CD3/Movies/MovieCD3.bif
 copylower "$CDMOUNT/cd3/" "$TARGETDIR"
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index 42d3c0d..c00a469 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -20,8 +20,8 @@ unshield -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die
 cp -R "$TARGETDIR"/minimumdata/* "$TARGETDIR" || die
 rm -r "$TARGETDIR"/minimumdata
 
-cp -R "$TARGETDIR"/recommended_music/music/* "$TARGETDIR"/music/ || die
-rm -r "$TARGETDIR"/recommended_music
+#cp -R "$TARGETDIR"/recommended_music/music/* "$TARGETDIR"/music/ # not a fatal error.  the directory doesn't appear to exist.
+#rm -r "$TARGETDIR"/recommended_music
 
 cp -R "$TARGETDIR"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die
 rm -r "$TARGETDIR"/english_sounds
diff --git a/includes/generic-includes.sh b/includes/generic-includes.sh
index d4dcdb4..97926f0 100644
--- a/includes/generic-includes.sh
+++ b/includes/generic-includes.sh
@@ -69,7 +69,7 @@ function setperms
 	find "$1" -type f -exec chmod 644 '{}' \;
 	find "$1" -type f -iname '*.exe' -exec chmod 755 '{}' \;
 	find "$1" -type f -iname '*.ini' -exec chmod 664 '{}' \;
-	chgrp -R games "$1"
+	chgrp -R games "$1" > /dev/null # fail silently if you don't use a games group.
 	if [ -d "$1"/save ]; then
 		chmod -R g+w "$1"/save
 	fi
-- 
cgit v1.2.3