From a6055bfb9b9847021ab93cddfdc31357b2c7fc38 Mon Sep 17 00:00:00 2001 From: Nick White Date: Fri, 1 May 2009 09:40:15 +0100 Subject: Fixed targetdir setting (thanks Nick Daly) Fixed a problem with setting targetdir which could result in the current directory being deleted. --- auto-installer.sh | 3 +++ includes/generic-includes.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/auto-installer.sh b/auto-installer.sh index 1fcdbc3..655bbaa 100755 --- a/auto-installer.sh +++ b/auto-installer.sh @@ -86,6 +86,9 @@ while [ -z "$MINSCRIPT" ]; do esac done +[ -z "$TARGETDIR" ] && [ -n "$SHORTGAMENAME" ] && export TARGETDIR="$PWD/$SHORTGAMENAME" +[ -z "$TARGETDIR" ] && diequietly + echo "$FULLGAMENAME detected, installing" "$scriptdir/$MINSCRIPT" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly diff --git a/includes/generic-includes.sh b/includes/generic-includes.sh index d3db9bf..983853a 100644 --- a/includes/generic-includes.sh +++ b/includes/generic-includes.sh @@ -17,7 +17,7 @@ [ -z "$TMPDIR" ] && export TMPDIR="/tmp/iepatch" -[ -z "$TARGETDIR" ] && export TARGETDIR="$PWD/$SHORTGAMENAME" +[ -z "$TARGETDIR" ] && [ -e "$SHORTGAMENAME" ] && export TARGETDIR="$PWD/$SHORTGAMENAME" [ -z "$LANGUAGE" ] && export LANGUAGE="English" -- cgit v1.2.3