[freenet-cvs] r21097 - trunk/apps/new_installer/res/unix/bin

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-07-12 04:38:56 +0000 (Sat, 12 Jul 2008)
New Revision: 21097

Modified:
   trunk/apps/new_installer/res/unix/bin/setup.sh
Log:
new_installer: fix a bug people who ran the installer as root might have 
encountered

Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh      2008-07-12 02:53:09 UTC 
(rev 21096)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh      2008-07-12 04:38:56 UTC 
(rev 21097)
@@ -4,6 +4,17 @@
 CAFILE="$INSTALL_PATH/startssl.pem"
 JOPTS=" -Djava.net.preferIPv4Stack=true "
 OS="`uname -s`"
+
+cd "$INSTALL_PATH"
+
+rm -f "$HOME/_install_toSource.sh"
+if test -e "$HOME/_install_toSource.sh"
+then
+       echo "Please delete the freenet directory and the file 
\"$HOME/_install_toSource.sh\" before restarting the installer."
+       touch .isInstalled
+       exit 0
+fi
+
 echo '#!/bin/sh' > "$HOME/_install_toSource.sh"
 echo INSTALL_PATH=\"$INSTALL_PATH\" >> "$HOME/_install_toSource.sh"
 echo CAFILE=\"$CAFILE\" >> "$HOME/_install_toSource.sh"
@@ -13,12 +24,11 @@
 chmod 755 "$HOME/_install_toSource.sh"
 alias .=

-cd "$INSTALL_PATH"
-
 if test -s freenet.ini
 then
        echo "The installer isn\'t meant to run more than once in the same 
directory"
        touch .isInstalled
+       rm -f "$HOME/_install_toSource.sh"
        exit 0
 fi

@@ -26,6 +36,7 @@
 then
        echo "The installer isn\'t meant to be run as root"
        touch .isInstalled
+       rm -f "$HOME/_install_toSource.sh"
        exit 0
 fi

@@ -55,6 +66,7 @@
        echo "#################################################################"
        cat jvmerror
        touch .isInstalled
+       rm -f "$HOME/_install_toSource.sh"
        exit 0
 fi
 rm -f jvmerror