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 /bg1 | |
| 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 'bg1')
| -rwxr-xr-x | bg1/install-3cd-minimal.sh | 3 | ||||
| -rwxr-xr-x | bg1/install-5cd-minimal.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh index f6446cf..1c4ae7d 100755 --- a/bg1/install-3cd-minimal.sh +++ b/bg1/install-3cd-minimal.sh @@ -33,8 +33,9 @@ cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die move_and_remove "${TARGETDIR}/minimumdata" "${TARGETDIR}" -move_and_remove "${TARGETDIR}/english_sounds/sounds" "${TARGETDIR}/sounds" move_and_remove "${TARGETDIR}/english" "${TARGETDIR}" +move_and_remove "${TARGETDIR}/english_sounds/sounds" "${TARGETDIR}/sounds" +rm -r "${TARGETDIR}/english_sounds" mkdir -p "${TARGETDIR}/movies" mkdir -p "${TARGETDIR}/manual" diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh index cd5cfa7..e6be0fa 100755 --- a/bg1/install-5cd-minimal.sh +++ b/bg1/install-5cd-minimal.sh @@ -33,9 +33,10 @@ cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die move_and_remove "${TARGETDIR}/minimumdata" "$TARGETDIR" +move_and_remove "${TARGETDIR}/english" "$TARGETDIR" move_and_remove "${TARGETDIR}/recommended_music/music" "${TARGETDIR}/music/" move_and_remove "${TARGETDIR}/english_sounds/sounds" "${TARGETDIR}/sounds/" -move_and_remove "${TARGETDIR}/english" "$TARGETDIR" +rm -r "${TARGETDIR}/recommended_music" "${TARGETDIR}/english_sounds" mkdir -p "${TARGETDIR}/movies" |