diff options
| author | Nick White <git@njw.me.uk> | 2009-06-01 23:42:06 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-06-01 23:42:06 +0100 |
| commit | 520746058d336ffec5a2acdcb757a1d143457b6a (patch) | |
| tree | 195acbeb539af2fcd33e88548f635a2e7a705555 /pst | |
| parent | 15066a0cfaa8ff37e08631d32c030e2982582b90 (diff) | |
| download | gemrb-gameinstallers-520746058d336ffec5a2acdcb757a1d143457b6a.tar.bz2 gemrb-gameinstallers-520746058d336ffec5a2acdcb757a1d143457b6a.zip | |
Use move_and_remove everywhere
And ensure parent directories are removed, where appropriate
Diffstat (limited to 'pst')
| -rwxr-xr-x | pst/install-2cd-minimal.sh | 3 | ||||
| -rwxr-xr-x | pst/install-4cd-minimal.sh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh index 7541216..45493bf 100755 --- a/pst/install-2cd-minimal.sh +++ b/pst/install-2cd-minimal.sh @@ -35,8 +35,7 @@ cp "${CDMOUNT}/Manual/Torment.pdf" "${TARGETDIR}/manual.pdf" || die cp "${CDMOUNT}/Torment.ico" "${TARGETDIR}/torment.ico" || die cp "${CDMOUNT}/Torment.ex_" "${TARGETDIR}/torment.exe" || die -mv "${TARGETDIR}/minimumdata/"* "$TARGETDIR" || die -rmdir "${TARGETDIR}/minimumdata" || die +move_and_remove "${TARGETDIR}/minimumdata/" "$TARGETDIR" mkdir -p "${TARGETDIR}/save" || die diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh index 8ee12dd..1bcb07b 100755 --- a/pst/install-4cd-minimal.sh +++ b/pst/install-4cd-minimal.sh @@ -30,8 +30,7 @@ mkdir -p "$TARGETDIR" || die unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die -cp -R "${TARGETDIR}/program_executable_files/"* "$TARGETDIR" || die -rm -r "${TARGETDIR}/program_executable_files" +move_and_remove "${TARGETDIR}/program_executable_files/" "$TARGETDIR" cp "${CDMOUNT}/torment.ico" "$TARGETDIR" || die |