Corrected file locations from Nick's merge

5 files changed, 11 insertions, 76 deletions

diff --git a/auto-installer.sh b/auto-installer.sh
index b6d7bd1..8be47f3 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -48,9 +48,9 @@ while [ -z "$MINSCRIPT" ]; do
     	$BG1_TOTSC_3CD_US_MD5 )
     	    FULLGAMENAME="Baldurs Gate & Tales of the Sword Coast: 3CD US version"
 			SHORTGAMENAME="baldursgate1totsc"
-    		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"
+    		MINSCRIPT=totsc/install-3cd-minimal.sh
+    		EXTRASCRIPT=totsc/install-3cd-extra.sh
+    		PATCHES="totsc/install-patch-baldurdash-fix.sh totsc/install-patch-baldurdash-text.sh"
     		WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
     		CDNO=3
     		;;
diff --git a/bg1/install-3cd-extra.sh b/bg1/install-3cd-extra.sh
deleted file mode 100755
index 95c96a3..0000000
--- a/bg1/install-3cd-extra.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Extra Baldur's Gate content (so CDs aren't needed)
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/cd-includes.sh"
-
-parseargs "$@"
-
-copylower "$CDMOUNT/cd1/" "$TARGETDIR"
-
-CD2_MD5="c04758a6af171bf9a35d8e3d4dcd807c"
-CD3_MD5="ba4224f50f890e10561d22f602d6a991"
-
-getcd 2 $CD2_MD5 CD2/Movies/MovieCD2.bif
-copylower "$CDMOUNT/cd2/" "$TARGETDIR"
-copylower "$CDMOUNT/cd5/" "$TARGETDIR"
-cp $CDMOUNT/Manual/Baldur.pdf "$TARGETDIR"/manual || die
-
-getcd 3 $CD3_MD5 CD3/Movies/MovieCD3.bif
-copylower "$CDMOUNT/cd3/" "$TARGETDIR"
-copylower "$CDMOUNT/cd4/" "$TARGETDIR"
-copylower "$CDMOUNT/cd6/" "$TARGETDIR"
-setperms "$TARGETDIR"
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
deleted file mode 100755
index 4169e40..0000000
--- a/bg1/install-3cd-minimal.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Baldur's Gate & Tales of the Sword Coast 3CD version minimal
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/cd-includes.sh"
-
-parseargs "$@"
-
-checkforbin unshield
-
-getcd 1 $BG1_TOTSC_3CD_US_MD5 data1.cab
-
-mkdir -p "$TARGETDIR" || die
-
-cp $CDMOUNT/dialog.tlk "$TARGETDIR" || die
-
-unshield -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die
-
-cp -R "$TARGETDIR"/minimumdata/* "$TARGETDIR" || die
-rm -r "$TARGETDIR"/minimumdata
-
-cp -R "$TARGETDIR"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die
-rm -r "$TARGETDIR"/english_sounds
-
-cp -R "$TARGETDIR"/english/* "$TARGETDIR" || die
-rm -r "$TARGETDIR"/english
-
-mkdir -p "$TARGETDIR"/movies
-mkdir -p "$TARGETDIR"/manual
-
-mkdir -p "$TARGETDIR"/save
-cp -R $CDMOUNT/[Ss]ave/* "$TARGETDIR"/save || die
-
-cp $CDMOUNT/Manual/BGManual.pdf "$TARGETDIR"/manual/ || die
-cp $CDMOUNT/Manual/TotscManual.pdf "$TARGETDIR"/manual/ || die
-
-cp $CDMOUNT/baldur.ico "$TARGETDIR" || die
-
-setperms "$TARGETDIR"
diff --git a/totsc/install-3cd-extra.sh b/totsc/install-3cd-extra.sh
index 31cc5d7..fe31c32 100755
--- a/totsc/install-3cd-extra.sh
+++ b/totsc/install-3cd-extra.sh
@@ -24,12 +24,15 @@ parseargs "$@"
 
 copylower "$CDMOUNT/cd1/" "$TARGETDIR"
 
-getcd 2 c04758a6af171bf9a35d8e3d4dcd807c CD2/Movies/MovieCD2.bif
+CD2_MD5="c04758a6af171bf9a35d8e3d4dcd807c"
+CD3_MD5="ba4224f50f890e10561d22f602d6a991"
+
+getcd 2 $CD2_MD5 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
+getcd 3 $CD3_MD5 CD3/Movies/MovieCD3.bif
 copylower "$CDMOUNT/cd3/" "$TARGETDIR"
 copylower "$CDMOUNT/cd4/" "$TARGETDIR"
 copylower "$CDMOUNT/cd6/" "$TARGETDIR"
diff --git a/totsc/install-3cd-minimal.sh b/totsc/install-3cd-minimal.sh
index 3493cad..57d9173 100755
--- a/totsc/install-3cd-minimal.sh
+++ b/totsc/install-3cd-minimal.sh
@@ -24,7 +24,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 1a6828b97a27967e8c4acc25e1ef48d2 data1.cab
+getcd 1 $BG1_TOTSC_3CD_US_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
@@ -35,9 +35,6 @@ 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"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die
 rm -r "$TARGETDIR"/english_sounds
 
@@ -48,8 +45,7 @@ mkdir -p "$TARGETDIR"/movies
 mkdir -p "$TARGETDIR"/manual
 
 mkdir -p "$TARGETDIR"/save
-mkdir -p "$TARGETDIR"/mpsave
-cp -R $CDMOUNT/[Ss]ave/* "$TARGETDIR"/mpsave || die
+cp -R $CDMOUNT/[Ss]ave/* "$TARGETDIR"/save || die
 
 cp $CDMOUNT/Manual/BGManual.pdf "$TARGETDIR"/manual/ || die
 cp $CDMOUNT/Manual/TotscManual.pdf "$TARGETDIR"/manual/ || die