[freenet-cvs] r13084 - in trunk/apps/new_installer: res/windows/bin src

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-05-01 15:58:57 +0000 (Tue, 01 May 2007)
New Revision: 13084

Modified:
   trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
   trunk/apps/new_installer/src/BindTest.java
Log:
Doh :$

Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd	2007-05-01 15:47:08 UTC (rev 13083)
+++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd	2007-05-01 15:58:57 UTC (rev 13084)
@@ -7,7 +7,7 @@
 :: Try to detect a free, available port for fproxy
 @set FPROXY_PORT=8888
 @java -jar bin\bindtest.jar %FPROXY_PORT% 
- at IF NOT ERRORLEVEL 1 GOTO configure_fproxy
+ at if errorlevel 0 goto configure_fproxy
 @set FPROXY_PORT=8889
 @bin\cat.exe welcome.html | bin\sed.exe "s/8888/%FPROXY_PORT%/g" > welcome2.html
 @move /Y welcome2.html welcome.html > NUL

Modified: trunk/apps/new_installer/src/BindTest.java
===================================================================
--- trunk/apps/new_installer/src/BindTest.java	2007-05-01 15:47:08 UTC (rev 13083)
+++ trunk/apps/new_installer/src/BindTest.java	2007-05-01 15:58:57 UTC (rev 13084)
@@ -12,12 +12,8 @@
 	public static void main(String[] args) {
 		try{
 			Integer port = Integer.valueOf(args[0]);
-			ServerSocket ss = null;
-			/* workaround a macos|windows problem */
-			String os = System.getProperty("os.name").toLowerCase();
-			ss = new ServerSocket();
-			if(os.startsWith("mac"))
-				ss.setReuseAddress(false);
+			ServerSocket ss = new ServerSocket();
+			ss.setReuseAddress(false);
 			ss.bind(new InetSocketAddress("127.0.0.1:", port.intValue()));
 			if(!ss.isBound())
 				System.exit(2);