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 --- pst/install-patch-official.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pst') diff --git a/pst/install-patch-official.sh b/pst/install-patch-official.sh index b053e37..3cac6a1 100755 --- a/pst/install-patch-official.sh +++ b/pst/install-patch-official.sh @@ -38,7 +38,7 @@ getpatch $patch_url cabextract -L "${TMPDIR}/${patch_name}" -d "$TMPDIR" || diesoftly unshield -L x "${TMPDIR}/data1.cab" -d "$TMPDIR" || diesoftly -cp -R "${TMPDIR}/program_executable_files/"* "$TARGETDIR" || diesoftly +copylower "${TMPDIR}/program_executable_files/" "$TARGETDIR" || diesoftly cleanuptmp 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 --- pst/install-2cd-extra.sh | 4 ++-- pst/install-2cd-minimal.sh | 4 ++-- pst/install-4cd-minimal.sh | 2 +- pst/install-patch-official.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pst') 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 -- cgit v1.2.3