From 520746058d336ffec5a2acdcb757a1d143457b6a Mon Sep 17 00:00:00 2001 From: Nick White Date: Mon, 1 Jun 2009 23:42:06 +0100 Subject: Use move_and_remove everywhere And ensure parent directories are removed, where appropriate --- bg1/install-3cd-minimal.sh | 3 ++- bg1/install-5cd-minimal.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'bg1') 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" -- cgit v1.2.3