[freenet-cvs] r11955 - in trunk/apps/new_installer: . res res/unix/bin res/windows/bin

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-03-04 17:20:08 +0000 (Sun, 04 Mar 2007)
New Revision: 11955

Removed:
   trunk/apps/new_installer/res/freenet.ini
Modified:
   trunk/apps/new_installer/install.xml
   trunk/apps/new_installer/res/unix/bin/1run.sh
   trunk/apps/new_installer/res/windows/bin/1run.cmd
Log:
new_installer: maybe fix the problem experienced by some when running the installer more than once on the same directory

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml	2007-03-04 15:23:01 UTC (rev 11954)
+++ trunk/apps/new_installer/install.xml	2007-03-04 17:20:08 UTC (rev 11955)
@@ -117,10 +117,8 @@
 				<exclude name="*/**/.svn/**"/>
 				<include name="bin/**/*"/>
 				<include name="wrapper.conf"/>
-				<include name="freenet.ini"/>
 				<include name="welcome.html"/>
 			</fileset>
-			<parsable targetfile="$INSTALL_PATH/freenet.ini"/> 
 		</pack>
 
 		<pack name="License" id="license" required="yes">

Deleted: trunk/apps/new_installer/res/freenet.ini
===================================================================
--- trunk/apps/new_installer/res/freenet.ini	2007-03-04 15:23:01 UTC (rev 11954)
+++ trunk/apps/new_installer/res/freenet.ini	2007-03-04 17:20:08 UTC (rev 11955)
@@ -1 +0,0 @@
-node.updater.enabled=true

Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh	2007-03-04 15:23:01 UTC (rev 11954)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh	2007-03-04 17:20:08 UTC (rev 11955)
@@ -3,16 +3,24 @@
 INSTALL_PATH="${INSTALL_PATH:-$PWD}"
 
 cd "$INSTALL_PATH"
-if test -s freenet-ext.jar
+if test -s freenet.ini
 then
-	echo "This script isn't meant to be used more than once."
-	exit
+	echo "This script isn't meant to be used more than once. I will rename your freenet.ini to freenet.old.ini and go on, but don't complain if it breaks\!"
+	mv freenet.ini freenet.old.ini
 fi
 
 # We need the exec flag on /bin
 chmod a+rx bin/* lib/* &>/dev/null
 
 # Tweak freenet.ini before the first startup
+echo "node.updater.enabled=true" > freenet.ini
+if test -e update
+then
+	echo "Enabling the auto-update feature"
+	echo "node.updater.autoupdate=true" >> freenet.ini
+	rm -f update
+fi
+
 PLUGINS=""
 if test -e stun
 then
@@ -39,13 +47,6 @@
 # Register plugins
 echo "pluginmanager.loadplugin=$PLUGINS" >> freenet.ini
 
-if test -e update
-then
-	echo "Enabling the auto-update feature"
-	echo "node.updater.autoupdate=true" >> freenet.ini
-	rm -f update
-fi
-
 echo "Detecting tcp-ports availability..."
 # Try to auto-detect the first available port for fproxy
 FPROXY_PORT=8888

Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd	2007-03-04 15:23:01 UTC (rev 11954)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd	2007-03-04 17:20:08 UTC (rev 11955)
@@ -3,6 +3,12 @@
 @set JAVA_HOME=$JAVA_HOME
 @cd /D %INSTALL_PATH%
 
+ at if not exist freenet.ini goto nocleanup
+ at echo I found a freenet.ini file in the directory !!! it shouldn't exist! I will rename it to freenet.old.ini and go on but don't complain if it breaks : the installer is meant to be used in an empty directory!
+ at rename freenet.ini freenet.old.ini
+ at del /F freenet.ini
+:nocleanup
+
 @echo "Registering .fref file extention"
 @echo Windows Registry Editor Version 5.00 >> fref.reg
 @echo [HKEY_CLASSES_ROOT\.fref] >> fref.reg
@@ -45,6 +51,7 @@
 
 @echo pluginmanager.loadplugin=%PLUGINS% >> freenet.ini
 
+ at echo node.updater.enabled=true >> freenet.ini
 @if exist update echo node.updater.autoupdate=true >> freenet.ini
 @del /F update > NUL