summaryrefslogtreecommitdiff
path: root/iwd
diff options
context:
space:
mode:
Diffstat (limited to 'iwd')
-rwxr-xr-xiwd/install-2cd-uk-minimal.sh10
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