1 files changed, 14 insertions, 19 deletions
diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index 57d9173..f6446cf 100755
--- a/bg1/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
@@ -17,8 +17,8 @@
 # Baldur's Gate & Tales of the Sword Coast (3CD version) minimal
 
 scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/cd-includes.sh"
+source "${scriptdir}/includes/generic-includes.sh"
+source "${scriptdir}/includes/cd-includes.sh"
 
 parseargs "$@"
 
@@ -28,28 +28,23 @@ getcd 1 $BG1_TOTSC_3CD_US_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
-cp $CDMOUNT/dialog.tlk "$TARGETDIR" || die
+cp "${CDMOUNT}/dialog.tlk" "$TARGETDIR" || die
 
-unshield -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die
+unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die
 
-cp -R "$TARGETDIR"/minimumdata/* "$TARGETDIR" || die
-rm -r "$TARGETDIR"/minimumdata
+move_and_remove "${TARGETDIR}/minimumdata" "${TARGETDIR}"
+move_and_remove "${TARGETDIR}/english_sounds/sounds" "${TARGETDIR}/sounds"
+move_and_remove "${TARGETDIR}/english" "${TARGETDIR}"
 
-cp -R "$TARGETDIR"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die
-rm -r "$TARGETDIR"/english_sounds
+mkdir -p "${TARGETDIR}/movies"
+mkdir -p "${TARGETDIR}/manual"
 
-cp -R "$TARGETDIR"/english/* "$TARGETDIR" || die
-rm -r "$TARGETDIR"/english
+mkdir -p "${TARGETDIR}/save"
+cp -R "${CDMOUNT}/"[Ss]ave/* "${TARGETDIR}/save" || die
 
-mkdir -p "$TARGETDIR"/movies
-mkdir -p "$TARGETDIR"/manual
+cp "${CDMOUNT}/Manual/BGManual.pdf" "${TARGETDIR}/manual/" || die
+cp "${CDMOUNT}/Manual/TotscManual.pdf" "${TARGETDIR}/manual/" || die
 
-mkdir -p "$TARGETDIR"/save
-cp -R $CDMOUNT/[Ss]ave/* "$TARGETDIR"/save || die
-
-cp $CDMOUNT/Manual/BGManual.pdf "$TARGETDIR"/manual/ || die
-cp $CDMOUNT/Manual/TotscManual.pdf "$TARGETDIR"/manual/ || die
-
-cp $CDMOUNT/baldur.ico "$TARGETDIR" || die
+cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die
 
 setperms "$TARGETDIR"