From dad2f8163435c5b1804147ff37c54799c2c38a14 Mon Sep 17 00:00:00 2001 From: Nick White Date: Tue, 23 Jun 2009 11:51:19 +0100 Subject: Sanitise copying further --- bg1/install-5cd-minimal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bg1') diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh index e6be0fa..b4c522d 100755 --- a/bg1/install-5cd-minimal.sh +++ b/bg1/install-5cd-minimal.sh @@ -28,7 +28,7 @@ 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 @@ -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 setperms "$TARGETDIR" -- cgit v1.2.3 From feb2cd603ba1ae6e7dc04e17463c87777f882363 Mon Sep 17 00:00:00 2001 From: Tasos Latsas Date: Thu, 18 Jun 2009 15:50:48 +0300 Subject: pass unshield options before extract command --- bg1/install-1cd-totsc-uk.sh | 2 +- bg1/install-3cd-minimal.sh | 2 +- bg1/install-5cd-minimal.sh | 2 +- bg1/install-patch-intl.sh | 2 +- bg1/install-patch-totsc-intl.sh | 2 +- bg1/install-patch-totsc-uk.sh | 2 +- bg1/install-patch-totsc-us.sh | 2 +- bg1/install-patch-us.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'bg1') 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 -- cgit v1.2.3