From 0d14bb784aa524de00c88e9a25bb812c5339cc43 Mon Sep 17 00:00:00 2001 From: nick Date: Mon, 25 May 2009 18:26:27 -0500 Subject: Safely escaped all potentially unsafe variables. And probably a couple already safe ones too. --- bg1/install-5cd-minimal.sh | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'bg1/install-5cd-minimal.sh') diff --git a/bg1/install-5cd-minimal.sh b/bg1/install-5cd-minimal.sh index 2e6ff59..cd5cfa7 100755 --- a/bg1/install-5cd-minimal.sh +++ b/bg1/install-5cd-minimal.sh @@ -17,8 +17,8 @@ # Baldur's Gate (5CD International 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,24 +28,17 @@ getcd 1 $BG1_5CD_INTL_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}/recommended_music/music" "${TARGETDIR}/music/" +move_and_remove "${TARGETDIR}/english_sounds/sounds" "${TARGETDIR}/sounds/" +move_and_remove "${TARGETDIR}/english" "$TARGETDIR" -cp -R "$TARGETDIR"/recommended_music/music/* "$TARGETDIR"/music/ || die -rm -r "$TARGETDIR"/recommended_music +mkdir -p "${TARGETDIR}/movies" -cp -R "$TARGETDIR"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die -rm -r "$TARGETDIR"/english_sounds - -cp -R "$TARGETDIR"/english/* "$TARGETDIR" || die -rm -r "$TARGETDIR"/english - -mkdir -p "$TARGETDIR"/movies - -cp $CDMOUNT/baldur.ico "$TARGETDIR" || die +cp "${CDMOUNT}/baldur.ico" "$TARGETDIR" || die setperms "$TARGETDIR" -- cgit v1.2.3