From 4f837e2cef827e6f700c5ae180551510ffedc718 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Sun, 16 Aug 2009 02:25:28 +0100
Subject: Work around unshield bug

Basically, if extracting to a directory which was not itself lowercase,
unshield would fail. This patch cds to the directory first, to work
around the issue.

http://sourceforge.net/tracker/?func=detail&aid=2801016&group_id=30550&atid=399601
---
 bg1/install-1cd-totsc-uk.sh     | 4 +++-
 bg1/install-3cd-minimal.sh      | 6 ++++--
 bg1/install-5cd-minimal.sh      | 4 +++-
 bg1/install-patch-intl.sh       | 4 +++-
 bg1/install-patch-totsc-intl.sh | 4 +++-
 bg1/install-patch-totsc-uk.sh   | 4 +++-
 bg1/install-patch-totsc-us.sh   | 4 +++-
 bg1/install-patch-us.sh         | 4 +++-
 8 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'bg1')

diff --git a/bg1/install-1cd-totsc-uk.sh b/bg1/install-1cd-totsc-uk.sh
index 49270fd..11780c3 100755
--- a/bg1/install-1cd-totsc-uk.sh
+++ b/bg1/install-1cd-totsc-uk.sh
@@ -28,7 +28,9 @@ getcd 1 $BG1_TOTSC_1CD_UK_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
-unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+cd "$TARGETDIR" && unshield -d . -L x "${CDMOUNT}/data1.cab" || die
 
 cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index 24f9dd8..1e770a4 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -30,7 +30,9 @@ mkdir -p "$TARGETDIR" || die
 
 cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
-unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+cd "$TARGETDIR" && unshield -d . -L x "${CDMOUNT}/data1.cab" || die
 
 move_and_remove "${TARGETDIR}/minimumdata" "${TARGETDIR}"
 move_and_remove "${TARGETDIR}/english" "${TARGETDIR}"
@@ -48,4 +50,4 @@ cp "${CDMOUNT}/Manual/TotscManual.pdf" "${TARGETDIR}/manual/" || die
 
 cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
 
-teardown "$TARGETDIR"
\ No newline at end of file
+teardown "$TARGETDIR"
diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh
index ad8c681..3ae2c88 100755
--- a/bg1/install-5cd-minimal.sh
+++ b/bg1/install-5cd-minimal.sh
@@ -30,7 +30,9 @@ mkdir -p "$TARGETDIR" || die
 
 copylower "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
-unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
+cd "$TARGETDIR" && unshield -d . -L x "${CDMOUNT}/data1.cab" || die
 
 move_and_remove "${TARGETDIR}/minimumdata" "$TARGETDIR"
 move_and_remove "${TARGETDIR}/english" "$TARGETDIR"
diff --git a/bg1/install-patch-intl.sh b/bg1/install-patch-intl.sh
index 745ee38..500b675 100755
--- a/bg1/install-patch-intl.sh
+++ b/bg1/install-patch-intl.sh
@@ -36,7 +36,9 @@ setuptmp
 getpatch $patch_url
 
 unzip "${TMPDIR}/${patch_name}" -d "${TMPDIR}" || diesoftly
-unshield -g "$LANGUAGE" -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -g "$LANGUAGE" -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+cd "$TMPDIR" && unshield -g "$LANGUAGE" -d . -L x "${TMPDIR}/data1.cab" || diesoftly
 
 LANGUAGE="$(echo $LANGUAGE|tr A-Z a-z|tr ' ' _)" # alter formatting
 cp -R "${TMPDIR}/${LANGUAGE}/"* "$TARGETDIR" || diesoftly
diff --git a/bg1/install-patch-totsc-intl.sh b/bg1/install-patch-totsc-intl.sh
index 337aa1d..01ecd46 100755
--- a/bg1/install-patch-totsc-intl.sh
+++ b/bg1/install-patch-totsc-intl.sh
@@ -36,7 +36,9 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+cd "$TMPDIR" && unshield -d . -L x "${TMPDIR}/data1.cab" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
diff --git a/bg1/install-patch-totsc-uk.sh b/bg1/install-patch-totsc-uk.sh
index 4a7727d..260cf5e 100755
--- a/bg1/install-patch-totsc-uk.sh
+++ b/bg1/install-patch-totsc-uk.sh
@@ -36,7 +36,9 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+cd "$TMPDIR" && unshield -d . -L x "${TMPDIR}/data1.cab" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
diff --git a/bg1/install-patch-totsc-us.sh b/bg1/install-patch-totsc-us.sh
index f01e4ec..8a47f79 100755
--- a/bg1/install-patch-totsc-us.sh
+++ b/bg1/install-patch-totsc-us.sh
@@ -36,7 +36,9 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+cd "$TMPDIR" && unshield -d . -L x "${TMPDIR}/data1.cab" || diesoftly
 
 cp -R "${TMPDIR}/minimumdata/"* "$TARGETDIR" || diesoftly
 
diff --git a/bg1/install-patch-us.sh b/bg1/install-patch-us.sh
index 5ed2d8e..45aca35 100755
--- a/bg1/install-patch-us.sh
+++ b/bg1/install-patch-us.sh
@@ -36,7 +36,9 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+# work around unshield bug (#2801016 in SynCE project)
+#unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
+cd "$TMPDIR" && unshield -d . -L x "${TMPDIR}/data1.cab" || diesoftly
 
 cp -R "${TMPDIR}/english/"* "$TARGETDIR" || diesoftly
 
-- 
cgit v1.2.3