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 /iwd | |
| 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 'iwd')
| -rwxr-xr-x | iwd/install-2cd-uk-minimal.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/iwd/install-2cd-uk-minimal.sh b/iwd/install-2cd-uk-minimal.sh index 10cd533..dd1c80a 100755 --- a/iwd/install-2cd-uk-minimal.sh +++ b/iwd/install-2cd-uk-minimal.sh @@ -30,12 +30,10 @@ mkdir -p "$TARGETDIR" || die unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die -cp -R "${TARGETDIR}/minimum_compressed/"* "$TARGETDIR" || die -rm -r "${TARGETDIR}/minimum_compressed" || die -rm -r "${TARGETDIR}/register" || die - -cp -R "${TARGETDIR}/recommended_compressed/data/"* "${TARGETDIR}/data" || die -rm -r "${TARGETDIR}/recommended_compressed" || die +move_and_remove "${TARGETDIR}/minimum_compressed/" "$TARGETDIR" +move_and_remove "${TARGETDIR}/recommended_compressed/data/" "${TARGETDIR}/data" +rm -r "${TARGETDIR}/recommended_compressed" +rm -r "${TARGETDIR}/register" copylower "${CDMOUNT}/Data" "${TARGETDIR}/data" || die copylower "${CDMOUNT}/ICEWIND.ICO" "$TARGETDIR" || die |