diff options
| author | Nick White <git@njw.me.uk> | 2009-08-16 02:25:28 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-08-16 02:25:28 +0100 |
| commit | 4f837e2cef827e6f700c5ae180551510ffedc718 (patch) | |
| tree | 403525e52860588ed9e9336b2197c26034bfe797 /pst | |
| parent | 95fa96a6c1d34ba8e53f8e9badd8c0d0c94eff37 (diff) | |
| download | gemrb-gameinstallers-4f837e2cef827e6f700c5ae180551510ffedc718.tar.bz2 gemrb-gameinstallers-4f837e2cef827e6f700c5ae180551510ffedc718.zip | |
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
Diffstat (limited to 'pst')
| -rwxr-xr-x | pst/install-2cd-extra.sh | 7 | ||||
| -rwxr-xr-x | pst/install-2cd-minimal.sh | 7 | ||||
| -rwxr-xr-x | pst/install-4cd-minimal.sh | 4 | ||||
| -rwxr-xr-x | pst/install-patch-official.sh | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh index c166cfe..b4cc21b 100755 --- a/pst/install-2cd-extra.sh +++ b/pst/install-2cd-extra.sh @@ -28,8 +28,11 @@ CD2="610d9f6354be741b09fc25b5e9645328" getcd 1 "$PST_2CD_MD5" data1.cab -unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data1.cab" || die -unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data2.cab" || die +# work around unshield bug (#2801016 in SynCE project) +#unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data1.cab" || die +#unshield -d "$TARGETDIR" -g OtherData -L x "${CDMOUNT}/data2.cab" || die +cd "$TARGETDIR" && unshield -d . -g OtherData -L x "${CDMOUNT}/data1.cab" || die +cd "$TARGETDIR" && unshield -d . -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 7f8fd18..73464fb 100755 --- a/pst/install-2cd-minimal.sh +++ b/pst/install-2cd-minimal.sh @@ -28,8 +28,11 @@ getcd 1 $PST_2CD_MD5 data1.cab mkdir -p "$TARGETDIR" || die -unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data1.cab" || die -unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data2.cab" || die +# work around unshield bug (#2801016 in SynCE project) +#unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data1.cab" || die +#unshield -d "$TARGETDIR" -g MinimumData -L x "${CDMOUNT}/data2.cab" || die +cd "$TARGETDIR" && unshield -d . -g MinimumData -L x "${CDMOUNT}/data1.cab" || die +cd "$TARGETDIR" && unshield -d . -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 46ec381..6bd5711 100755 --- a/pst/install-4cd-minimal.sh +++ b/pst/install-4cd-minimal.sh @@ -28,7 +28,9 @@ getcd 1 $PST_4CD_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 move_and_remove "${TARGETDIR}/program_executable_files/" "$TARGETDIR" diff --git a/pst/install-patch-official.sh b/pst/install-patch-official.sh index a924f33..cfa576d 100755 --- a/pst/install-patch-official.sh +++ b/pst/install-patch-official.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 copylower "${TMPDIR}/program_executable_files/" "$TARGETDIR" || diesoftly |