Created and integrated teardown method.

Now if only I could create a setup method...

23 files changed, 24 insertions, 130 deletions

diff --git a/bg1/install-1cd-totsc-uk.sh b/bg1/install-1cd-totsc-uk.sh
index 3584c07..161e14d 100755
--- a/bg1/install-1cd-totsc-uk.sh
+++ b/bg1/install-1cd-totsc-uk.sh
@@ -45,4 +45,4 @@ copylower "$CDMOUNT/cd6/" "$TARGETDIR"
 mkdir -p "${TARGETDIR}/mpsave"
 cp -R "${CDMOUNT}/"[Ss]ave/* "${TARGETDIR}/mpsave" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-3cd-extra.sh b/bg1/install-3cd-extra.sh
index 7af0cbb..f517bb0 100755
--- a/bg1/install-3cd-extra.sh
+++ b/bg1/install-3cd-extra.sh
@@ -36,4 +36,5 @@ getcd 3 "$CD3_MD5" "CD3/Movies/MovieCD3.bif"
 copylower "${CDMOUNT}/cd3/" "$TARGETDIR"
 copylower "${CDMOUNT}/cd4/" "$TARGETDIR"
 copylower "${CDMOUNT}/cd6/" "$TARGETDIR"
-setperms "$TARGETDIR"
+
+teardown "$TARGETDIR"
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index 1c4ae7d..b9e3fef 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -48,4 +48,4 @@ cp "${CDMOUNT}/Manual/TotscManual.pdf" "${TARGETDIR}/manual/" || die
 
 cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
\ No newline at end of file
diff --git a/bg1/install-5cd-extra.sh b/bg1/install-5cd-extra.sh
index df5dbef..dcca194 100755
--- a/bg1/install-5cd-extra.sh
+++ b/bg1/install-5cd-extra.sh
@@ -36,5 +36,6 @@ for CDNUMBER in 1 2 3 4 5; do
 	fi
 
 	copylower "${CDMOUNT}/cd${CDNUMBER}/" "$TARGETDIR"
-	setperms "$TARGETDIR"
 done
+
+teardown "$TARGETDIR"
diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh
index e6be0fa..6351c13 100755
--- a/bg1/install-5cd-minimal.sh
+++ b/bg1/install-5cd-minimal.sh
@@ -42,4 +42,4 @@ mkdir -p "${TARGETDIR}/movies"
 
 cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-baldurdash-fix.sh b/bg1/install-patch-baldurdash-fix.sh
index 90b629b..71ffab9 100755
--- a/bg1/install-patch-baldurdash-fix.sh
+++ b/bg1/install-patch-baldurdash-fix.sh
@@ -41,5 +41,4 @@ unzip -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" 2>/dev/null
 rm "${TMPDIR}/${patch_name}" "${TMPDIR}/bg1fixpack11readme.txt"
 cp "${TMPDIR}/"* "${TARGETDIR}/override/" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-baldurdash-text.sh b/bg1/install-patch-baldurdash-text.sh
index 885bc1b..7fa845f 100755
--- a/bg1/install-patch-baldurdash-text.sh
+++ b/bg1/install-patch-baldurdash-text.sh
@@ -45,5 +45,4 @@ getpatch $patch_url
 unzip -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" 2>/dev/null
 cp "${TMPDIR}/dialog.tlk" "${TARGETDIR}/" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-intl.sh b/bg1/install-patch-intl.sh
index 56ec960..16211d4 100755
--- a/bg1/install-patch-intl.sh
+++ b/bg1/install-patch-intl.sh
@@ -41,5 +41,4 @@ unshield -g "$LANGUAGE" -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 LANGUAGE="$(echo $LANGUAGE|tr A-Z a-z|tr ' ' _)" # alter formatting
 cp -R "${TMPDIR}/${LANGUAGE}/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-totsc-baldurdash-text.sh b/bg1/install-patch-totsc-baldurdash-text.sh
index 5a9bc71..ac576bc 100755
--- a/bg1/install-patch-totsc-baldurdash-text.sh
+++ b/bg1/install-patch-totsc-baldurdash-text.sh
@@ -45,5 +45,4 @@ getpatch $patch_url
 unzip -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" 2>/dev/null
 cp "${TMPDIR}/dialog.tlk" "${TARGETDIR}/" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-totsc-intl.sh b/bg1/install-patch-totsc-intl.sh
index 4c7d57e..ef1beb1 100755
--- a/bg1/install-patch-totsc-intl.sh
+++ b/bg1/install-patch-totsc-intl.sh
@@ -40,5 +40,4 @@ unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-totsc-uk.sh b/bg1/install-patch-totsc-uk.sh
index 10fc8f0..3b7b9f1 100755
--- a/bg1/install-patch-totsc-uk.sh
+++ b/bg1/install-patch-totsc-uk.sh
@@ -40,5 +40,4 @@ unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-totsc-us.sh b/bg1/install-patch-totsc-us.sh
index 9518ae9..56b1028 100755
--- a/bg1/install-patch-totsc-us.sh
+++ b/bg1/install-patch-totsc-us.sh
@@ -40,5 +40,4 @@ unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/bg1/install-patch-us.sh b/bg1/install-patch-us.sh
index 2d382ea..d1dd7c1 100755
--- a/bg1/install-patch-us.sh
+++ b/bg1/install-patch-us.sh
@@ -40,5 +40,4 @@ unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 
 cp -R "${TMPDIR}/english/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/includes/cd-list.sh~ b/includes/cd-list.sh~
deleted file mode 100644
index 17cdfe6..0000000
--- a/includes/cd-list.sh~
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-# Copyright 2009 Nick White
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# See <http://www.gnu.org/licenses/> for a copy of the GNU General
-# Public License.
-#
-# Selects the appropriate installer(s) for an Infinity Engine game,
-# based on the CD inserted
-
-while [ -z "$MINSCRIPT" ]; do
-	case "$1" in
-		$BG1_5CD_INTL_MD5 )
-			FULLGAMENAME="Baldurs Gate 1: 5CD International version"
-			SHORTGAMENAME="baldursgate1"
-			MINSCRIPT="bg1/install-5cd-minimal.sh"
-			EXTRASCRIPT="bg1/install-5cd-extra.sh"
-			PATCHES="bg1/install-patch-intl.sh 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"
-			CDNO=5
-			;;
-		$BG1_TOTSC_3CD_US_MD5 )
-			FULLGAMENAME="Baldurs Gate 1 & 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-totsc-baldurdash-text.sh"
-			WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
-			CDNO=3
-			;;
-		$BG1_TOTSC_1CD_UK_MD5 )
-			FULLGAMENAME="Baldurs Gate 1 & Tales of the Sword Coast: 1CD UK version"
-			SHORTGAMENAME="baldursgate1totsc"
-			MINSCRIPT="bg1/install-1cd-totsc-uk.sh"
-			PATCHES="bg1/install-patch-totsc-uk.sh bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh"
-			WINDOWSFILES="bgmain2.exe baldur.exe config.exe mconvert.exe"
-			;;
-		$BG2_4CD_US_MD5 )
-			FULLGAMENAME="Baldurs Gate 2 - Shadows of Amn: 4CD US version"
-			SHORTGAMENAME="baldursgate2soa"
-			MINSCRIPT="bg2/install-4cd-minimal-us.sh"
-			# TODO: uncomment when complete EXTRASCRIPT="bg2/install-4cd-extra-us.sh"
-			EXPANSIONSCRIPT=
-			PATCHES="" # TODO: fill in patches
-			# bg2/install-patch-soa-us.sh bg2/install-patch-baldurdash-fix.sh bg2/install-patch-soa-baldurdash-text.sh"
-			WINDOWSFILES="bgdxtest.exe bggltest.exe glsetup.exe bgconfig.exe bgmain.exe charview.exe"
-			;;
-		# $BG2_TOB_1CD_US_MD5 )
-		# 	FULLGAMENAME="Baldurs Gate 2 - Throne of Bhaal: 1CD US version"
-		# 	SHORTGAMENAME="baldursgate2tob"
-		# 	MINSCRIPT="bg2/install-1cd-tob-us.sh"
-		# 	PATCHES="" # TODO: fill in patches
-		#     # bg2/install-patch-totsc-uk.sh bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh"
-		# 	# TODO: correct the list of windows files.
-		#     WINDOWSFILES="" # "bgmain2.exe baldur.exe config.exe mconvert.exe"
-		# 	;;
-		$PST_2CD_MD5 )
-			FULLGAMENAME="Planescape Torment: 2CD version"
-			SHORTGAMENAME="planescapetorment"
-			MINSCRIPT="pst/install-2cd-minimal.sh"
-			EXTRASCRIPT="pst/install-2cd-extra.sh"
-			WINDOWSFILES="torment.exe ereg"
-			CDNO=2
-			;;
-		$PST_4CD_MD5 )
-			FULLGAMENAME="Planescape Torment: 4CD version"
-			SHORTGAMENAME="planescapetorment"
-			MINSCRIPT="pst/install-4cd-minimal.sh"
-			EXTRASCRIPT="pst/install-4cd-extra.sh"
-			PATCHES="pst/install-patch-official.sh"
-			WINDOWSFILES="torment.exe ereg"
-			CDNO=4
-			;;
-		$IWD_2CD_UK_MD5 )
-			FULLGAMENAME="Icewind Dale 2CD UK version"
-			SHORTGAMENAME="icewinddale"
-			MINSCRIPT="iwd/install-2cd-uk-minimal.sh"
-			EXTRASCRIPT="iwd/install-2cd-uk-extra.sh"
-			PATCHES="iwd/install-patch-uk-fix.sh iwd/install-patch-us.sh"
-			WINDOWSFILES="3dfx.dll config.exe icewind.ini keymap.ini language.ini mpicewnd.mpi"
-			CDNO=2
-			;;
-		* )
-			echo "Unrecognised CD - please select game from menu"
-			choosegame
-			;;
-	esac
-done
diff --git a/iwd/install-2cd-uk-extra.sh b/iwd/install-2cd-uk-extra.sh
index 22ee2dd..bd2376e 100755
--- a/iwd/install-2cd-uk-extra.sh
+++ b/iwd/install-2cd-uk-extra.sh
@@ -28,4 +28,4 @@ getcd 2 $CD2 AUTORUN.DAT
 
 copylower "${CDMOUNT}/CD2/DATA/" "${TARGETDIR}/data" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/iwd/install-2cd-uk-minimal.sh b/iwd/install-2cd-uk-minimal.sh
index dd1c80a..eac533e 100755
--- a/iwd/install-2cd-uk-minimal.sh
+++ b/iwd/install-2cd-uk-minimal.sh
@@ -38,4 +38,4 @@ rm -r "${TARGETDIR}/register"
 copylower "${CDMOUNT}/Data" "${TARGETDIR}/data" || die
 copylower "${CDMOUNT}/ICEWIND.ICO" "$TARGETDIR" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/iwd/install-patch-uk-fix.sh b/iwd/install-patch-uk-fix.sh
index 63fc051..f137a92 100755
--- a/iwd/install-patch-uk-fix.sh
+++ b/iwd/install-patch-uk-fix.sh
@@ -39,5 +39,4 @@ getpatch $patch_url
 cabextract -L -s "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
 cp -R "${TMPDIR}/override/"* "${TARGETDIR}/override" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/iwd/install-patch-us.sh b/iwd/install-patch-us.sh
index d636baa..625c023 100755
--- a/iwd/install-patch-us.sh
+++ b/iwd/install-patch-us.sh
@@ -39,5 +39,4 @@ cabextract -L -s "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
 cp -R "${TMPDIR}/override/"* "${TARGETDIR}/override" || diesoftly
 cp -R "${TMPDIR}/scripts/"* "${TARGETDIR}/scripts" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh
index 82e9002..75ea9b9 100755
--- a/pst/install-2cd-extra.sh
+++ b/pst/install-2cd-extra.sh
@@ -38,4 +38,4 @@ getcd 2 "$CD2" "cd2/movies4.bif"
 
 copylower "${CDMOUNT}/cd2/" "$TARGETDIR" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh
index 45493bf..8f63edb 100755
--- a/pst/install-2cd-minimal.sh
+++ b/pst/install-2cd-minimal.sh
@@ -39,4 +39,4 @@ move_and_remove "${TARGETDIR}/minimumdata/" "$TARGETDIR"
 
 mkdir -p "${TARGETDIR}/save" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/pst/install-4cd-extra.sh b/pst/install-4cd-extra.sh
index 1344d65..6db15b5 100755
--- a/pst/install-4cd-extra.sh
+++ b/pst/install-4cd-extra.sh
@@ -37,4 +37,4 @@ copylower "${CDMOUNT}/cd3/" "$TARGETDIR" || die
 getcd 4 $CD4 cd4/movies4.bif
 copylower "${CDMOUNT}/cd4/" "$TARGETDIR" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh
index 1bcb07b..c8c1991 100755
--- a/pst/install-4cd-minimal.sh
+++ b/pst/install-4cd-minimal.sh
@@ -36,4 +36,4 @@ cp "${CDMOUNT}/torment.ico" "$TARGETDIR" || die
 
 mkdir -p "${TARGETDIR}/save" || die
 
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"
diff --git a/pst/install-patch-official.sh b/pst/install-patch-official.sh
index b053e37..fc97f79 100755
--- a/pst/install-patch-official.sh
+++ b/pst/install-patch-official.sh
@@ -40,5 +40,4 @@ unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
 
 cp -R "${TMPDIR}/program_executable_files/"* "$TARGETDIR" || diesoftly
 
-cleanuptmp
-setperms "$TARGETDIR"
+teardown "$TARGETDIR"