Merge branch 'master' of http://git.njw.me.uk/gemrb-gameinstallers

Conflicts:

	auto-installer.sh

8 files changed, 10 insertions, 10 deletions

diff --git a/bg1/install-1cd-totsc-uk.sh b/bg1/install-1cd-totsc-uk.sh
index 161e14d..49270fd 100755
--- a/bg1/install-1cd-totsc-uk.sh
+++ b/bg1/install-1cd-totsc-uk.sh
@@ -28,7 +28,7 @@ getcd 1 $BG1_TOTSC_1CD_UK_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
-unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die
+unshield -d "$TARGETDIR" -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 b9e3fef..24f9dd8 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -30,7 +30,7 @@ mkdir -p "$TARGETDIR" || die
 
 cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
-unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die
+unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
 
 move_and_remove "${TARGETDIR}/minimumdata" "${TARGETDIR}"
 move_and_remove "${TARGETDIR}/english" "${TARGETDIR}"
diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh
index 6351c13..ad8c681 100755
--- a/bg1/install-5cd-minimal.sh
+++ b/bg1/install-5cd-minimal.sh
@@ -28,9 +28,9 @@ getcd 1 $BG1_5CD_INTL_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
-cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
+copylower "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
-unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die
+unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die
 
 move_and_remove "${TARGETDIR}/minimumdata" "$TARGETDIR"
 move_and_remove "${TARGETDIR}/english" "$TARGETDIR"
@@ -40,6 +40,6 @@ rm -r "${TARGETDIR}/recommended_music" "${TARGETDIR}/english_sounds"
 
 mkdir -p "${TARGETDIR}/movies"
 
-cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
+copylower "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
 
 teardown "$TARGETDIR"
diff --git a/bg1/install-patch-intl.sh b/bg1/install-patch-intl.sh
index 16211d4..745ee38 100755
--- a/bg1/install-patch-intl.sh
+++ b/bg1/install-patch-intl.sh
@@ -36,7 +36,7 @@ setuptmp
 getpatch $patch_url
 
 unzip "${TMPDIR}/${patch_name}" -d "${TMPDIR}" || diesoftly
-unshield -g "$LANGUAGE" -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
+unshield -g "$LANGUAGE" -d "$TMPDIR" -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 ef1beb1..337aa1d 100755
--- a/bg1/install-patch-totsc-intl.sh
+++ b/bg1/install-patch-totsc-intl.sh
@@ -36,7 +36,7 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
+unshield -d "$TMPDIR" -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 3b7b9f1..4a7727d 100755
--- a/bg1/install-patch-totsc-uk.sh
+++ b/bg1/install-patch-totsc-uk.sh
@@ -36,7 +36,7 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
+unshield -d "$TMPDIR" -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 56b1028..f01e4ec 100755
--- a/bg1/install-patch-totsc-us.sh
+++ b/bg1/install-patch-totsc-us.sh
@@ -36,7 +36,7 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
+unshield -d "$TMPDIR" -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 d1dd7c1..5ed2d8e 100755
--- a/bg1/install-patch-us.sh
+++ b/bg1/install-patch-us.sh
@@ -36,7 +36,7 @@ setuptmp
 getpatch $patch_url
 
 cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly
-unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly
+unshield -d "$TMPDIR" -L x "${TMPDIR}/data1.cab" || diesoftly
 
 cp -R "${TMPDIR}/english/"* "$TARGETDIR" || diesoftly