Author: nextgens Date: 2006-09-03 18:27:10 +0000 (Sun, 03 Sep 2006) New Revision: 10383
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh trunk/apps/new_installer/res/windows/bin/1run.cmd Log: new_installer: don't spawn up the web-browser until the installation is really finished Modified: trunk/apps/new_installer/res/unix/bin/1run.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-09-03 16:36:39 UTC (rev 10382) +++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-09-03 18:27:10 UTC (rev 10383) @@ -92,11 +92,6 @@ # Starting the node up ./run.sh start -echo "Waiting for Freenet to startup" -sleep 10 -echo "Starting up a browser" -java -cp bin/browser.jar BareBonesBrowserLaunch "http://127.0.0.1:$FPROXY_PORT/"; -java -cp bin/browser.jar BareBonesBrowserLaunch "file:///$INSTALL_PATH/welcome.html" if [[ -e thaw ]] then @@ -122,6 +117,10 @@ java -jar bin/uncompress.jar frost.zip frost &>/dev/null fi +echo "Starting up a browser" +java -cp bin/browser.jar BareBonesBrowserLaunch "http://127.0.0.1:$FPROXY_PORT/"; +java -cp bin/browser.jar BareBonesBrowserLaunch "file:///$INSTALL_PATH/welcome.html" + echo "Finished" exit 0 Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-09-03 16:36:39 UTC (rev 10382) +++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-09-03 18:27:10 UTC (rev 10383) @@ -103,13 +103,7 @@ :: Start the node up @net start freenet-darknet-%FPROXY_PORT% - at echo "Waiting for freenet to startup" - at ping -n 5 127.0.0.1 >nul - at echo "Spawing up a browser" - at start http://127.0.0.1:%FPROXY_PORT%/ - at start welcome.html - :: Installing additionnal softwares @if not exist jsite goto nojsite @del /F jsite > NUL @@ -132,4 +126,8 @@ @java -jar bin\uncompress.jar frost.zip frost > NUL :nofrost + at echo "Spawing up a browser" + at start http://127.0.0.1:%FPROXY_PORT%/ + at start welcome.html + @echo "Finished"
