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 --- iwd/install-2cd-uk-minimal.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'iwd') 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 -- cgit v1.2.3