Author: toad Date: 2009-01-21 14:49:24 +0000 (Wed, 21 Jan 2009) New Revision: 25196
Modified: trunk/apps/new_installer/res/unix/Uninstaller/show_uninstall_survey.sh trunk/apps/new_installer/res/unix/bin/browse.sh trunk/apps/new_installer/res/windows/browse.cmd Log: History cloaking support in installer: Revert 25104-25106 Property changes on: trunk/apps/new_installer/res/unix/Uninstaller/show_uninstall_survey.sh ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/apps/new_installer/res/unix/bin/browse.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/browse.sh 2009-01-21 14:47:48 UTC (rev 25195) +++ trunk/apps/new_installer/res/unix/bin/browse.sh 2009-01-21 14:49:24 UTC (rev 25196) @@ -3,17 +3,17 @@ cd "$INSTALL_PATH" POSSIBLE_NAMES="iceweasel firefox mozilla mozilla-firefox" +if test $# -lt 1 +then + URL="http://127.0.0.1:8888"; +else + URL="$1" +fi + # Wait until the installer has finished while test ! -f Uninstaller/install.log do sleep 1 done -if test $# -lt 1 -then - URL="`cat freenet.url.dat`" -else - URL="$1" -fi - 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-21 14:47:48 UTC (rev 25195) +++ trunk/apps/new_installer/res/windows/browse.cmd 2009-01-21 14:49:24 UTC (rev 25196) @@ -3,23 +3,23 @@ @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 ) @if %COUNT% GEQ 1 goto withURL -...@set /P URL=<freenet.url.dat +...@set URL="http://127.0.0.1:8888/"; @goto doneURL :withURL @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
