Author: nextgens Date: 2008-06-04 16:27:42 +0000 (Wed, 04 Jun 2008) New Revision: 20200
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh trunk/apps/new_installer/res/unix/bin/browse.sh trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd trunk/apps/new_installer/res/windows/browse.cmd Log: new_installer: cleaner that way Modified: trunk/apps/new_installer/res/unix/bin/1run.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/1run.sh 2008-06-04 15:46:56 UTC (rev 20199) +++ trunk/apps/new_installer/res/unix/bin/1run.sh 2008-06-04 16:27:42 UTC (rev 20200) @@ -9,5 +9,3 @@ # Starting the node up echo "Starting Freenet 0.7..." nohup sh ./run.sh start 2>&1 >wrapper.log & - -sh ./bin/browse.sh & Modified: trunk/apps/new_installer/res/unix/bin/browse.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/browse.sh 2008-06-04 15:46:56 UTC (rev 20199) +++ trunk/apps/new_installer/res/unix/bin/browse.sh 2008-06-04 16:27:42 UTC (rev 20200) @@ -13,7 +13,6 @@ # Wait until the installer has finished while test ! -f Uninstaller/install.log do - URL="http://127.0.0.1:8888/wizard/"; sleep 1 done Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh 2008-06-04 15:46:56 UTC (rev 20199) +++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh 2008-06-04 16:27:42 UTC (rev 20200) @@ -57,7 +57,6 @@ rm -f dont-close-me.*html mv _dont-close-me.html dont-close-me.html - # Try to auto-detect the first available port for fcp FCP_PORT=9481 java $JOPTS -jar bin/bindtest.jar $FCP_PORT 2>&1 >/dev/null @@ -68,3 +67,5 @@ fi echo "fcp.enabled=true" >> freenet.ini echo "fcp.port=$FCP_PORT" >> freenet.ini + +sh ./bin/browse.sh "http://127.0.0.1:$FPROXY_PORT/wizard/"; & Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2008-06-04 15:46:56 UTC (rev 20199) +++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2008-06-04 16:27:42 UTC (rev 20200) @@ -110,6 +110,6 @@ @echo - Start the node up @net start freenet-darknet-%FPROXY_PORT% - at start "" /B "browse" + at start "" /B "browse" "http://127.0.0.1:%FPROXY_PORT%/wizard"; :endl10n :end Modified: trunk/apps/new_installer/res/windows/browse.cmd =================================================================== --- trunk/apps/new_installer/res/windows/browse.cmd 2008-06-04 15:46:56 UTC (rev 20199) +++ trunk/apps/new_installer/res/windows/browse.cmd 2008-06-04 16:27:42 UTC (rev 20200) @@ -7,7 +7,6 @@ @set COUNT=0 @for %%x in (%*) do @( set /A COUNT=%COUNT%+1 ) @if %COUNT% GEQ 1 goto withURL - at set URL="http://127.0.0.1:8888/"; @goto doneURL :withURL @set URL="%1" @@ -16,7 +15,6 @@ :: Loop until the install process is over :beforeLoop @if exist Uninstaller/install.log goto begin - at set URL="http://127.0.0.1:8888/wizard/"; @ping -n 1 127.0.0.1>NUL @goto beforeLoop :begin
