summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick White <git@njw.me.uk>2009-04-16 09:34:35 +0100
committerNick White <git@njw.me.uk>2009-04-16 09:34:35 +0100
commitf370d9f9392270acecf87921c8961c32f0327fe8 (patch)
tree422ec93ecfb7cd8c5b2fb191eb6be0e3ba41e1ee
parent3ecf0d63f3ce379f08e3d6aa609a4e73aa1f98b2 (diff)
downloadgemrb-gameinstallers-f370d9f9392270acecf87921c8961c32f0327fe8.tar.bz2
gemrb-gameinstallers-f370d9f9392270acecf87921c8961c32f0327fe8.zip
Use scriptdir to allow running from anywhere
-rwxr-xr-xauto-installer.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/auto-installer.sh b/auto-installer.sh
index e7de650..b68fd45 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -86,12 +86,12 @@ esac
echo "$FULLGAMENAME detected, installing"
-$MINSCRIPT -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
+"$scriptdir/$MINSCRIPT" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
-if [ -n "$EXTRASCRIPT" ]; then
+if [ -n "$scriptdir/$EXTRASCRIPT" ]; then
if query "Do you want to do a full install, so the CDs will not be needed again?" y; then
FULLINSTALL=1
- $EXTRASCRIPT -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
+ "$scriptdir/$EXTRASCRIPT" -i "$TARGETDIR" -c "$CDMOUNT" 1>/dev/null || diequietly
else
FULLINSTALL=0
fi
@@ -99,6 +99,7 @@ fi
if [ -n "$PATCHES" ]; then
for patch in $PATCHES; do
+ patch="$scriptdir/$patch"
# grab 17th line from scripts (description line; after license)
patchtitle=$(sed -n 17p $patch|cut -d ' ' -f 2-)
if query "Do you want to install $patchtitle" y; then