diff options
| -rwxr-xr-x | bg1/install-1cd-totsc-uk.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-3cd-minimal.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-5cd-minimal.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-intl.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-totsc-intl.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-totsc-uk.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-totsc-us.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-us.sh | 2 | ||||
| -rwxr-xr-x | bg2/install-4cd-minimal-us.sh | 2 | ||||
| -rwxr-xr-x | iwd/install-2cd-uk-minimal.sh | 2 | ||||
| -rwxr-xr-x | iwd2/install-2cd-us-minimal.sh | 2 | ||||
| -rwxr-xr-x | iwd2/install-patch-us.sh | 2 | ||||
| -rwxr-xr-x | pst/install-2cd-extra.sh | 4 | ||||
| -rwxr-xr-x | pst/install-2cd-minimal.sh | 4 | ||||
| -rwxr-xr-x | pst/install-4cd-minimal.sh | 2 | ||||
| -rwxr-xr-x | pst/install-patch-official.sh | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/bg1/install-1cd-totsc-uk.sh b/bg1/install-1cd-totsc-uk.sh index 3584c07..4067e6b 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 1c4ae7d..a0b49e8 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 b4c522d..0e34e33 100755 --- a/bg1/install-5cd-minimal.sh +++ b/bg1/install-5cd-minimal.sh @@ -30,7 +30,7 @@ mkdir -p "$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" diff --git a/bg1/install-patch-intl.sh b/bg1/install-patch-intl.sh index 56ec960..4f8a45f 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 4c7d57e..c2f2162 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 10fc8f0..29638a5 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 9518ae9..9581919 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 2d382ea..f22045f 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 diff --git a/bg2/install-4cd-minimal-us.sh b/bg2/install-4cd-minimal-us.sh index 864b010..42eda0c 100755 --- a/bg2/install-4cd-minimal-us.sh +++ b/bg2/install-4cd-minimal-us.sh @@ -33,7 +33,7 @@ mkdir -p "${TARGETDIR}/portraits" || die cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die -unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die +unshield -d "$TARGETDIR" -L x "${CDMOUNT}/data1.cab" || die rm -r "${TARGETDIR}/_"* # remove all the the fake directories. diff --git a/iwd/install-2cd-uk-minimal.sh b/iwd/install-2cd-uk-minimal.sh index dd1c80a..abfe6fe 100755 --- a/iwd/install-2cd-uk-minimal.sh +++ b/iwd/install-2cd-uk-minimal.sh @@ -28,7 +28,7 @@ getcd 1 $IWD_2CD_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 move_and_remove "${TARGETDIR}/minimum_compressed/" "$TARGETDIR" move_and_remove "${TARGETDIR}/recommended_compressed/data/" "${TARGETDIR}/data" diff --git a/iwd2/install-2cd-us-minimal.sh b/iwd2/install-2cd-us-minimal.sh index f057576..5af6459 100755 --- a/iwd2/install-2cd-us-minimal.sh +++ b/iwd2/install-2cd-us-minimal.sh @@ -28,7 +28,7 @@ getcd 1 $IWD2_2CD_US_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 move_and_remove "${TARGETDIR}/minimum_compressed_-_us_english/" "$TARGETDIR" || die move_and_remove "${TARGETDIR}/minimum_compressed_-_language_independent/" "$TARGETDIR" || die diff --git a/iwd2/install-patch-us.sh b/iwd2/install-patch-us.sh index bb2fa8f..2528e44 100755 --- a/iwd2/install-patch-us.sh +++ b/iwd2/install-patch-us.sh @@ -35,7 +35,7 @@ setuptmp getpatch $patch_url cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly -unshield -L x "${TMPDIR}/disk1/data1.cab" -d "$TMPDIR" || diesoftly +unshield -d "$TMPDIR" -L x "${TMPDIR}/disk1/data1.cab" || diesoftly cp -R "${TMPDIR}/minimum_compressed_-_language_independent/override/"* "${TARGETDIR}"/override || diesoftly cp -R "${TMPDIR}/minimum_compressed_-_language_independent/scripts/"* "${TARGETDIR}"/scripts || diesoftly diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh index 82e9002..ccdd0fd 100755 --- a/pst/install-2cd-extra.sh +++ b/pst/install-2cd-extra.sh @@ -28,8 +28,8 @@ 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 +unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data1.cab" || die +unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data2.cab" || die mv "${TARGETDIR}/otherdata/"* "$TARGETDIR" || die rmdir "${TARGETDIR}/otherdata" || die diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh index 45493bf..329d84f 100755 --- a/pst/install-2cd-minimal.sh +++ b/pst/install-2cd-minimal.sh @@ -28,8 +28,8 @@ getcd 1 $PST_2CD_MD5 data1.cab mkdir -p "$TARGETDIR" || die -unshield -g MinimumData -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die -unshield -g MinimumData -L x "${CDMOUNT}/data2.cab" -d "$TARGETDIR" || die +unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data1.cab" || die +unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data2.cab" || die cp "${CDMOUNT}/Manual/Torment.pdf" "${TARGETDIR}/manual.pdf" || die cp "${CDMOUNT}/Torment.ico" "${TARGETDIR}/torment.ico" || die diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh index 1bcb07b..97fdf4a 100755 --- a/pst/install-4cd-minimal.sh +++ b/pst/install-4cd-minimal.sh @@ -28,7 +28,7 @@ getcd 1 $PST_4CD_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 move_and_remove "${TARGETDIR}/program_executable_files/" "$TARGETDIR" diff --git a/pst/install-patch-official.sh b/pst/install-patch-official.sh index 3cac6a1..0c244a8 100755 --- a/pst/install-patch-official.sh +++ b/pst/install-patch-official.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 copylower "${TMPDIR}/program_executable_files/" "$TARGETDIR" || diesoftly |