Author: toad
Date: 2009-01-17 18:01:59 +0000 (Sat, 17 Jan 2009)
New Revision: 25105
Modified:
trunk/apps/new_installer/res/unix/bin/browse.sh
trunk/apps/new_installer/res/windows/browse.cmd
Log:
Doh - node not started yet!
Modified: trunk/apps/new_installer/res/unix/bin/browse.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/browse.sh 2009-01-17 17:46:00 UTC
(rev 25104)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh 2009-01-17 18:01:59 UTC
(rev 25105)
@@ -3,6 +3,12 @@
cd "$INSTALL_PATH"
POSSIBLE_NAMES="iceweasel firefox mozilla mozilla-firefox"
+# Wait until the installer has finished
+while test ! -f Uninstaller/install.log
+do
+ sleep 1
+done
+
if test $# -lt 1
then
URL="http://127.0.0.1:8888";
@@ -10,10 +16,4 @@
URL="`cat freenet.url.dat`"
fi
-# Wait until the installer has finished
-while test ! -f Uninstaller/install.log
-do
- sleep 1
-done
-
java -Djava.net.preferIPv4Stack=true -cp bin/browser.jar
BareBonesBrowserLaunch "$URL" &
Modified: trunk/apps/new_installer/res/windows/browse.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/browse.cmd 2009-01-17 17:46:00 UTC
(rev 25104)
+++ trunk/apps/new_installer/res/windows/browse.cmd 2009-01-17 18:01:59 UTC
(rev 25105)
@@ -3,6 +3,13 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
+:: Loop until the install process is over
+:beforeLoop
+...@if exist Uninstaller/install.log goto begin
+...@ping -n 1 127.0.0.1>NUL
+...@goto beforeLoop
+:begin
+
:: Get the URL from the parameters if set
@set COUNT=0
@for %%x in (%*) do @( set /A COUNT=%COUNT%+1 )
@@ -13,13 +20,6 @@
@set URL="%1"
:doneURL
-:: Loop until the install process is over
-:beforeLoop
-...@if exist Uninstaller/install.log goto begin
-...@ping -n 1 127.0.0.1>NUL
-...@goto beforeLoop
-:begin
-
:: Use firefox if available, since on Windows the most likely alternative is
IE, and that definitely has problems with Freenet
:: Check the simple case first (FF exists and has been detected)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
