diff options
| author | Nick Daly <myownlittlworld@hotmail.com> | 2009-07-02 20:24:27 -0500 |
|---|---|---|
| committer | Nick Daly <myownlittlworld@hotmail.com> | 2009-07-02 20:24:27 -0500 |
| commit | f4b77bbe86d5e97e7960d5132d73c15daaffeabf (patch) | |
| tree | ad4f3f9606cbafa0f79806c828be99bf666d1dcb /pst | |
| parent | d370a8e2a2d58d20da284683bd9262e6ca696746 (diff) | |
| parent | feb2cd603ba1ae6e7dc04e17463c87777f882363 (diff) | |
| download | gemrb-gameinstallers-f4b77bbe86d5e97e7960d5132d73c15daaffeabf.tar.bz2 gemrb-gameinstallers-f4b77bbe86d5e97e7960d5132d73c15daaffeabf.zip | |
Merge branch 'master' of http://git.njw.me.uk/gemrb-gameinstallers
Conflicts:
auto-installer.sh
Diffstat (limited to 'pst')
| -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 | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh index 75ea9b9..c166cfe 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 8f63edb..7f8fd18 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 c8c1991..46ec381 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 fc97f79..a924f33 100755 --- a/pst/install-patch-official.sh +++ b/pst/install-patch-official.sh @@ -36,8 +36,8 @@ 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}/program_executable_files/"* "$TARGETDIR" || diesoftly +copylower "${TMPDIR}/program_executable_files/" "$TARGETDIR" || diesoftly teardown "$TARGETDIR" |