[freenet-cvs] r11865 - in trunk/apps/new_installer: res/unix/bin src

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-02-21 00:34:50 +0000 (Wed, 21 Feb 2007)
New Revision: 11865

Modified:
   trunk/apps/new_installer/res/unix/bin/1run.sh
   trunk/apps/new_installer/src/Sha1Test.java
Log:
installer: fix a typo, start the browser only once

Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh       2007-02-21 00:17:58 UTC 
(rev 11864)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh       2007-02-21 00:34:50 UTC 
(rev 11865)
@@ -53,12 +53,12 @@
 if test $? -ne 0
 then
        FPROXY_PORT=8889
-       echo "Can not bind fproxy to 8888: let's try $FPROXY_PORT insteed."
+       echo "Can not bind fproxy to 8888: let's try $FPROXY_PORT instead."
        java -jar bin/bindtest.jar $FPROXY_PORT
        if test $? -ne 0
        then
                FPROXY_PORT=9999
-               echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT 
insteed."
+               echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT 
instead."
        fi
        cat welcome.html | sed "s/8888/$FPROXY_PORT/g" >welcome2.html
        mv welcome2.html welcome.html
@@ -71,7 +71,7 @@
 if test $? -ne 0
 then
        FCP_PORT=9482
-       echo "Can not bind fcp to 9481: force it to $FCP_PORT insteed."
+       echo "Can not bind fcp to 9481: force it to $FCP_PORT instead."
 fi
 echo -e "fcp.enabled=true\nfcp.port=$FCP_PORT" >> freenet.ini

@@ -81,7 +81,7 @@
 if test $? -ne 0
 then
        CONSOLE_PORT=2324
-       echo "Can not bind console to 2323: force it to $CONSOLE_PORT insteed."
+       echo "Can not bind console to 2323: force it to $CONSOLE_PORT instead."
 fi
 echo -e "console.enabled=true\nconsole.port=$CONSOLE_PORT" >> freenet.ini

@@ -122,7 +122,6 @@
 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"

Modified: trunk/apps/new_installer/src/Sha1Test.java
===================================================================
--- trunk/apps/new_installer/src/Sha1Test.java  2007-02-21 00:17:58 UTC (rev 
11864)
+++ trunk/apps/new_installer/src/Sha1Test.java  2007-02-21 00:34:50 UTC (rev 
11865)
@@ -122,6 +122,7 @@

                } catch (Exception ioe) {
                        System.out.println(ioe);
+                       ioe.printStackTrace();
                } finally {
                        try {
                                if(is != null) is.close();