diff options
| -rwxr-xr-x | bg1/install-3cd-minimal.sh | 3 | ||||
| -rwxr-xr-x | bg1/install-5cd-minimal.sh | 3 | ||||
| -rwxr-xr-x | iwd/install-2cd-uk-minimal.sh | 10 | ||||
| -rwxr-xr-x | pst/install-2cd-minimal.sh | 3 | ||||
| -rwxr-xr-x | pst/install-4cd-minimal.sh | 3 |
5 files changed, 10 insertions, 12 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" 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 diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh index 7541216..45493bf 100755 --- a/pst/install-2cd-minimal.sh +++ b/pst/install-2cd-minimal.sh @@ -35,8 +35,7 @@ cp "${CDMOUNT}/Manual/Torment.pdf" "${TARGETDIR}/manual.pdf" || die cp "${CDMOUNT}/Torment.ico" "${TARGETDIR}/torment.ico" || die cp "${CDMOUNT}/Torment.ex_" "${TARGETDIR}/torment.exe" || die -mv "${TARGETDIR}/minimumdata/"* "$TARGETDIR" || die -rmdir "${TARGETDIR}/minimumdata" || die +move_and_remove "${TARGETDIR}/minimumdata/" "$TARGETDIR" mkdir -p "${TARGETDIR}/save" || die diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh index 8ee12dd..1bcb07b 100755 --- a/pst/install-4cd-minimal.sh +++ b/pst/install-4cd-minimal.sh @@ -30,8 +30,7 @@ mkdir -p "$TARGETDIR" || die unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die -cp -R "${TARGETDIR}/program_executable_files/"* "$TARGETDIR" || die -rm -r "${TARGETDIR}/program_executable_files" +move_and_remove "${TARGETDIR}/program_executable_files/" "$TARGETDIR" cp "${CDMOUNT}/torment.ico" "$TARGETDIR" || die |