Store MD5 sums as variables, avoid data duplication, increase clarity.

11 files changed, 51 insertions, 18 deletions

diff --git a/auto-installer.sh b/auto-installer.sh
index f6c7927..f66e510 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -18,7 +18,7 @@ echo "Checking CD version"
 CDMD5=$(md5sum $CDMOUNT/data1.cab|awk '{print $1}')
 
 case "$CDMD5" in
-	"138528155dfeb695bd63f90eacee7dc0" )
+	$BG1_5CD_INTL_MD5 )
 		FULLGAMENAME="Baldurs Gate 1: 5CD International version"
 		SHORTGAMENAME="bg1"
 		MINSCRIPT=bg1/install-5cd-minimal.sh
@@ -27,7 +27,7 @@ case "$CDMD5" in
 		WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
 		CDNO=5
 		;;
-	"1a6828b97a27967e8c4acc25e1ef48d2" )
+	$BG1_TOTSC_3CD_US_MD5 )
 		FULLGAMENAME="Baldurs Gate Tales of the Sword Coast: 3CD US version"
 		SHORTGAMENAME="bg1"
 		MINSCRIPT=bg1/install-3cd-minimal.sh
@@ -36,14 +36,14 @@ case "$CDMD5" in
 		WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
 		CDNO=3
 		;;
-	"e27d259ddc0171ff945dbba136e60309" )
+	$BG1_TOTSC_1CD_UK_MD5 )
 		FULLGAMENAME="Baldurs Gate Tales of the Sword Coast: 1CD UK version"
 		SHORTGAMENAME="totsc"
 		MINSCRIPT=totsc/install-1cd-uk.sh
 		PATCHES="totsc/install-patch-uk.sh totsc/install-patch-baldurdash-fix.sh totsc/install-patch-baldurdash-text.sh"
 		WINDOWSFILES="bgmain2.exe baldur.exe config.exe mconvert.exe"
 		;;
-	"640b61443cc86c434f1b6826e63c0e33" )
+	$PST_2CD_MD5 )
 		FULLGAMENAME="Planescape Torment: 2CD version"
 		SHORTGAMENAME="pst"
 		MINSCRIPT=pst/install-2cd-minimal.sh
@@ -52,7 +52,7 @@ case "$CDMD5" in
 		WINDOWSFILES="torment.exe ereg"
 		CDNO=2
 		;;
-	"5e8c2075163aca124de4a467fb33063d" )
+	$PST_4CD_MD5 )
 		FULLGAMENAME="Planescape Torment: 4CD version"
 		SHORTGAMENAME="pst"
 		MINSCRIPT=pst/install-4cd-minimal.sh
diff --git a/bg1/install-3cd-extra.sh b/bg1/install-3cd-extra.sh
index 871ebbe..95c96a3 100755
--- a/bg1/install-3cd-extra.sh
+++ b/bg1/install-3cd-extra.sh
@@ -9,12 +9,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/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/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index eaef847..4169e40 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -9,7 +9,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 1a6828b97a27967e8c4acc25e1ef48d2 data1.cab
+getcd 1 $BG1_TOTSC_3CD_US_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh
index 3db68d0..274bffa 100755
--- a/bg1/install-5cd-minimal.sh
+++ b/bg1/install-5cd-minimal.sh
@@ -9,7 +9,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 138528155dfeb695bd63f90eacee7dc0 data1.cab
+getcd 1 $BG1_5CD_INTL_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
diff --git a/includes/cd-includes.sh b/includes/cd-includes.sh
index e3d00fd..877aa57 100644
--- a/includes/cd-includes.sh
+++ b/includes/cd-includes.sh
@@ -2,6 +2,30 @@
 
 [ -z "$CDMOUNT" ] && export CDMOUNT="/media/cdrom"
 
+export BG1_5CD_INTL_MD5="138528155dfeb695bd63f90eacee7dc0"
+export BG1_TOTSC_3CD_US_MD5="1a6828b97a27967e8c4acc25e1ef48d2"
+export BG1_TOTSC_1CD_UK_MD5="e27d259ddc0171ff945dbba136e60309"
+
+export BG2_4CD_US_MD5="8acf4a6348de916bfaf077469a427b65"
+
+export PST_2CD_MD5="640b61443cc86c434f1b6826e63c0e33"
+export PST_4CD_MD5="5e8c2075163aca124de4a467fb33063d"
+
+export IWD_2CD_US_MD5=""
+export IWD_HOW_1CD_US_MD5=""
+
+export IWD2_2CD_US_MD5=""
+
+# a record of every IE collection I can find.
+export IWD_ULTIMATE_COLLECTION_MD5=""
+export BG1_1DVD_MD5=""
+export BG_COMPLILATION_1DVD_MD5=""
+#export BG2_COMPLILATION_NCD_MD5="" # no idea how many cds.
+export BLACK_ISLE_COMPILATION_PART_ONE_MD5=""
+export BLACK_ISLE_COMPILATION_PART_TWO_MD5=""
+export ULTIMATE_DUNGEONS_DRAGONS_MD5=""
+export ROLLENSPIELE_DELUXE_EDITION_MD5=""
+
 ### functions ###
 
 function checkcd
diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh
index 6901c10..c8f3d36 100755
--- a/pst/install-2cd-extra.sh
+++ b/pst/install-2cd-extra.sh
@@ -9,7 +9,9 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 640b61443cc86c434f1b6826e63c0e33 data1.cab
+CD2="610d9f6354be741b09fc25b5e9645328"
+
+getcd 1 $PST_2CD_MD5 data1.cab
 
 unshield -g OtherData -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die
 unshield -g OtherData -L x $CDMOUNT/data2.cab -d "$TARGETDIR" || die
@@ -17,7 +19,7 @@ unshield -g OtherData -L x $CDMOUNT/data2.cab -d "$TARGETDIR" || die
 mv "$TARGETDIR"/otherdata/* "$TARGETDIR" || die
 rmdir "$TARGETDIR"/otherdata || die
 
-getcd 2 610d9f6354be741b09fc25b5e9645328 cd2/movies4.bif
+getcd 2 $CD2 cd2/movies4.bif
 
 copylower "$CDMOUNT/cd2/" "$TARGETDIR" || die
 
diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh
index d868b90..fc5dc4a 100755
--- a/pst/install-2cd-minimal.sh
+++ b/pst/install-2cd-minimal.sh
@@ -11,7 +11,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 640b61443cc86c434f1b6826e63c0e33 data1.cab
+getcd 1 $PST_2CD_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
diff --git a/pst/install-4cd-extra.sh b/pst/install-4cd-extra.sh
index 064edb4..23dee20 100755
--- a/pst/install-4cd-extra.sh
+++ b/pst/install-4cd-extra.sh
@@ -9,13 +9,17 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 2 99be7c8544016302c820088091c52fef cd2/movies2.bif
+CD2="99be7c8544016302c820088091c52fef"
+CD3="6ffd2c51a41603c7dca6196d9bef2e26"
+CD4="b70322aaa7b1d61a168a766eba399085"
+
+getcd 2  $CD2 cd2/movies2.bif
 copylower "$CDMOUNT/cd2/" "$TARGETDIR" || die
 
-getcd 3 6ffd2c51a41603c7dca6196d9bef2e26 cd3/AR0500.bif
+getcd 3 $CD3 cd3/AR0500.bif
 copylower "$CDMOUNT/cd3/" "$TARGETDIR" || die
 
-getcd 4 b70322aaa7b1d61a168a766eba399085 cd4/movies4.bif
+getcd 4 $CD4 cd4/movies4.bif
 copylower "$CDMOUNT/cd4/" "$TARGETDIR" || die
 
 setperms "$TARGETDIR"
diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh
index 5ffb88b..0401e32 100755
--- a/pst/install-4cd-minimal.sh
+++ b/pst/install-4cd-minimal.sh
@@ -11,7 +11,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 5e8c2075163aca124de4a467fb33063d data1.cab
+getcd 1 $PST_4CD_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
diff --git a/totsc/auto-totsc-installer.sh b/totsc/auto-totsc-installer.sh
index f82114a..d485e5a 100755
--- a/totsc/auto-totsc-installer.sh
+++ b/totsc/auto-totsc-installer.sh
@@ -11,7 +11,7 @@ echo "Checking CD version"
 CDMD5=$(md5sum $CDMOUNT/data1.cab|awk '{print $1}')
 
 case "$CDMD5" in
-	"e27d259ddc0171ff945dbba136e60309" )
+	$BG1_TOTSC_1CD_UK_MD5 )
 		FULLGAMENAME="Baldurs Gate Tales of the Sword Coast: 1CD UK version"
 		INSTALLSCRIPT=./install-totsc-1cd-uk.sh
 		OFFICIALPATCH=./install-totsc-patch-uk.sh
diff --git a/totsc/install-1cd-uk.sh b/totsc/install-1cd-uk.sh
index d1d2ccb..7330f43 100755
--- a/totsc/install-1cd-uk.sh
+++ b/totsc/install-1cd-uk.sh
@@ -9,7 +9,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 e27d259ddc0171ff945dbba136e60309 data1.cab
+getcd 1 $BG1_TOTSC_1CD_UK_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die