From 53b5dbf87938455048f2c87661a69af77e0232bb Mon Sep 17 00:00:00 2001
From: NickDaly <myownlittlworld@hotmail.com>
Date: Sat, 6 Jun 2009 18:01:39 -0500
Subject: Created and integrated teardown method.

Now if only I could create a setup method...
---
 bg1/install-1cd-totsc-uk.sh                | 2 +-
 bg1/install-3cd-extra.sh                   | 3 ++-
 bg1/install-3cd-minimal.sh                 | 2 +-
 bg1/install-5cd-extra.sh                   | 3 ++-
 bg1/install-5cd-minimal.sh                 | 2 +-
 bg1/install-patch-baldurdash-fix.sh        | 3 +--
 bg1/install-patch-baldurdash-text.sh       | 3 +--
 bg1/install-patch-intl.sh                  | 3 +--
 bg1/install-patch-totsc-baldurdash-text.sh | 3 +--
 bg1/install-patch-totsc-intl.sh            | 3 +--
 bg1/install-patch-totsc-uk.sh              | 3 +--
 bg1/install-patch-totsc-us.sh              | 3 +--
 bg1/install-patch-us.sh                    | 3 +--
 13 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'bg1')

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"
-- 
cgit v1.2.3