Author: toad
Date: 2009-01-02 14:12:52 +0000 (Fri, 02 Jan 2009)
New Revision: 24882

Removed:
   trunk/apps/new_installer/res/dont-close-me.chn.html
   trunk/apps/new_installer/res/dont-close-me.deu.html
   trunk/apps/new_installer/res/dont-close-me.fra.html
   trunk/apps/new_installer/res/dont-close-me.html
   trunk/apps/new_installer/res/firefox_profile/
   trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
   trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
Modified:
   trunk/apps/new_installer/ProcessPanel.Spec.xml
   trunk/apps/new_installer/install.xml
   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/browse.cmd
Log:
REMOVE FIREFOX PROFILE.
More trouble than it's worth - in particular the firefox bugs still seem to be 
occurring for a small proportion of uninstalling users.
The security and performance problems solved by the firefox profile have other 
solutions, which will be committed shortly.


Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml      2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml      2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -90,15 +90,6 @@
                <os family="windows"/>
                <executefile name="$INSTALL_PATH\bin\install_freenet-ext.cmd"/>
        </job>
-       <job name="Downloading the firefox profile">
-               <os family="unix"/>
-               <os family="mac"/>
-               <executefile 
name="$INSTALL_PATH/bin/install_firefox_profile.sh"/>
-       </job>
-       <job name="Downloading the firefox profile">
-               <os family="windows"/>
-               <executefile 
name="$INSTALL_PATH\bin\install_firefox_profile.cmd"/>
-       </job>
        <job name="Detecting port availability">
                <os family="unix"/>
                <os family="mac"/>

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml        2009-01-02 13:10:56 UTC (rev 
24881)
+++ trunk/apps/new_installer/install.xml        2009-01-02 14:12:52 UTC (rev 
24882)
@@ -140,7 +140,6 @@
                        <executable 
targetfile="$INSTALL_PATH\bin\remove_service.bat" keep="true" 
stage="uninstall"/>
                        <parsable targetfile="$INSTALL_PATH\bin\cleanup.cmd"/>
                        <parsable targetfile="$INSTALL_PATH\browse.cmd"/>
-                       <parsable 
targetfile="$INSTALL_PATH\bin\install_firefox_profile.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_freenet-ext.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_freenet-stable-latest.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_plugins.cmd"/>
@@ -243,11 +242,6 @@
                        </parsable>
                </pack>
 
-               <pack name="Firefox Profile" id="firefox_profile" 
required="yes" parent="base">
-                       <description>Sets a customized firefox profile up for 
freenet browsing. Strongly recommended.</description>
-                       <singlefile src="res/license/LICENSE.Freenet" 
target="$INSTALL_PATH/firefox_profile.install"/>
-               </pack>
-
                <pack name="Plugins" id="plugins" required="no">
                        <description>A set of plugins for freenet 
nodes</description>
                </pack>

Deleted: trunk/apps/new_installer/res/dont-close-me.chn.html
===================================================================
--- trunk/apps/new_installer/res/dont-close-me.chn.html 2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/dont-close-me.chn.html 2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -1,106 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>Please don't close me</title>
-    <link rel="shortcut icon" href="freenet.ico" type="image/x-icon" />
-    <style type="text/css">
-p, span, div, td, th, li, h1, h2, h3, h4, h5 {
-  font-family: Arial;
-  font-weight: normal;
-  font-size: 11pt;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  background-color: #f0f0f0;
-}
-
-/* page's topbar */
-
-#topbar {
-  margin: 0;
-  padding: 5px;
-  min-height: 50px;
-  background-color: #e8e8e8;
-  background-image: url(http://127.0.0.1:8888/static/themes/clean/logo.png);
-  background-repeat: no-repeat;
-  background-position: 30px 3px;
-  border-bottom: 1px solid #d0d0d0;
-}
-
-#topbar h1 {
-  margin: 0;
-  padding: 7px 0 0 0;
-  text-align: center;
-  font-size: 20pt;
-}
-
-/* content */
-
-#content {
-  margin: 10px 50px;
-  padding: 0;
-}
-
-a {
-  color: #000000;
-}
-
-a:hover {
-  color: #ff0000;
-}
-
-abbr {
-  cursor: help;
-  border-bottom: dotted 1px black;
-}
-
-#copyright {
-  font-size: 8pt;
-  text-align: center;
-}
-
-/* infoboxes */
-
-div.infobox {
-  margin: 0 0 5px 0;
-  padding: 10px;
-  background-color: #f0f0f0;
-  border: 1px solid #d0d0d0;
-}
-
-div.infobox div.infobox-header {
-  margin: -10px -10px 10px -10px;
-  padding: 10px 35px 10px 10px;
-  border-bottom: 1px dotted #a0a0a0;
-  font-weight: bold;
-  font-size: 11pt;
-  background-color: #e8e8e8;
-  background-repeat: no-repeat;
-  background-position: right;
-}
-
-#started {
-  font-weight: bold;
-  font-size: 20pt;
-  text-align: center;
-}
-    </style>
-  </head>
-  <body>
-    <div id="page">
-      <div id="topbar">
-        <h1>請不要關閉這個頁面</h1>
-      </div>
-      <div id="content">
-        <div class="infobox">
- <p><b>未浏览完 Freenet 之前,请不要关闭这个浏览器视窗。</b></p>
-       <p>我们特别定制了一个 Firefox 设定档(profile),让你浏灠 Freenet 时可以更安全和畅顺。因为一些 Firefox 
的技术上问题,如果你在关闭 Freenet 视窗(黑色外观,应该将会在几秒内自动开启)前关闭这个视窗,你可以不能够再次返回 Firefox 
。如果发生这个情况,请即关闭 Freenet 视窗(可能要重新开机)。我们将尽力在 0.8 版前解决这个问题。再次多谢阁下使用 Freenet。</p>
-        <p><i>Freenet 开发团队</i></p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

Deleted: trunk/apps/new_installer/res/dont-close-me.deu.html
===================================================================
--- trunk/apps/new_installer/res/dont-close-me.deu.html 2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/dont-close-me.deu.html 2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -1,118 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="de" xml:lang="de">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>Bitte nicht schließen</title>
-    <link rel="shortcut icon" href="freenet.ico" type="image/x-icon" />
-    <style type="text/css">
-p, span, div, td, th, li, h1, h2, h3, h4, h5 {
-  font-family: Arial;
-  font-weight: normal;
-  font-size: 11pt;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  background-color: #f0f0f0;
-}
-
-/* page's topbar */
-
-#topbar {
-  margin: 0;
-  padding: 5px;
-  min-height: 50px;
-  background-color: #e8e8e8;
-  background-image: url(http://127.0.0.1:8888/static/themes/clean/logo.png);
-  background-repeat: no-repeat;
-  background-position: 30px 3px;
-  border-bottom: 1px solid #d0d0d0;
-}
-
-#topbar h1 {
-  margin: 0;
-  padding: 7px 0 0 0;
-  text-align: center;
-  font-size: 20pt;
-}
-
-/* content */
-
-#content {
-  margin: 10px 50px;
-  padding: 0;
-}
-
-a {
-  color: #000000;
-}
-
-a:hover {
-  color: #ff0000;
-}
-
-abbr {
-  cursor: help;
-  border-bottom: dotted 1px black;
-}
-
-#copyright {
-  font-size: 8pt;
-  text-align: center;
-}
-
-/* infoboxes */
-
-div.infobox {
-  margin: 0 0 5px 0;
-  padding: 10px;
-  background-color: #f0f0f0;
-  border: 1px solid #d0d0d0;
-}
-
-div.infobox div.infobox-header {
-  margin: -10px -10px 10px -10px;
-  padding: 10px 35px 10px 10px;
-  border-bottom: 1px dotted #a0a0a0;
-  font-weight: bold;
-  font-size: 11pt;
-  background-color: #e8e8e8;
-  background-repeat: no-repeat;
-  background-position: right;
-}
-
-#started {
-  font-weight: bold;
-  font-size: 20pt;
-  text-align: center;
-}
-    </style>
-  </head>
-  <body>
-    <div id="page">
-      <div id="topbar">
-        <h1>Bitte schließen Sie diese Seite nicht</h1>
-      </div>
-      <div id="content">
-        <div class="infobox">
-        <p><b>Bitte schließen Sie dieses Browser-Fenster erst, wenn Sie damit
-        fertig sind im Freenet zu stöbern.</b></p>
-        <p>
-        Um die Sicherheit und Performance zu maximieren haben wir ein 
spezielles
-        Firefox-Profil zum surfen im Freenet angelegt. Wenn Sie jedoch dieses
-        Fenster schließen bevor Sie das Freenet-Fenster schließen (mit dem
-        schwarzen Aussehen, es sollte in ein paar Sekunden starten oder ist
-        vielleicht schon gestartet), können Sie, aufgrund eines Fehlers in
-        Firefox, eventuell nicht mehr zurück in den Firefox zurück kommen.
-        Wenn dies passiert, schließen Sie bitte das Freenet-Fenster und
-        starten Sie Ihren Computer, wenn nötig, neu. Wir werden versuchen eine
-        bessere Lösung für Version 0.8 zu finden. Vielen Dank, dass Sie Freenet
-        benutzen.
-        </p>
-        <p><i>Das Freenet-Entwicklungs-Team</i></p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

Deleted: trunk/apps/new_installer/res/dont-close-me.fra.html
===================================================================
--- trunk/apps/new_installer/res/dont-close-me.fra.html 2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/dont-close-me.fra.html 2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -1,110 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W4C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="fr" xml:lang="fr">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>S'il vous plait ne me fermez pas</title>
-    <link rel="shortcut icon" href="freenet.ico" type="image/x-icon" />
-    <style type="text/css">
-p, span, div, td, th, li, h1, h2, h3, h4, h5 {
-  font-family: Arial;
-  font-weight: normal;
-  font-size: 11pt;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  background-color: #f0f0f0;
-}
-
-/* page's topbar */
-
-#topbar {
-  margin: 0;
-  padding: 5px;
-  min-height: 50px;
-  background-color: #e8e8e8;
-  background-image: url(http://127.0.0.1:8888/static/themes/clean/logo.png);
-  background-repeat: no-repeat;
-  background-position: 30px 3px;
-  border-bottom: 1px solid #d0d0d0;
-}
-
-#topbar h1 {
-  margin: 0;
-  padding: 7px 0 0 0;
-  text-align: center;
-  font-size: 20pt;
-}
-
-/* content */
-
-#content {
-  margin: 10px 50px;
-  padding: 0;
-}
-
-a {
-  color: #000000;
-}
-
-a:hover {
-  color: #ff0000;
-}
-
-abbr {
-  cursor: help;
-  border-bottom: dotted 1px black;
-}
-
-#copyright {
-  font-size: 8pt;
-  text-align: center;
-}
-
-/* infoboxes */
-
-div.infobox {
-  margin: 0 0 5px 0;
-  padding: 10px;
-  background-color: #f0f0f0;
-  border: 1px solid #d0d0d0;
-}
-
-div.infobox div.infobox-header {
-  margin: -10px -10px 10px -10px;
-  padding: 10px 35px 10px 10px;
-  border-bottom: 1px dotted #a0a0a0;
-  font-weight: bold;
-  font-size: 11pt;
-  background-color: #e8e8e8;
-  background-repeat: no-repeat;
-  background-position: right;
-}
-
-#started {
-  font-weight: bold;
-  font-size: 20pt;
-  text-align: center;
-}
-    </style>
-  </head>
-  <body>
-    <div id="page">
-      <div id="topbar">
-        <h1>S'il vous plaît ne fermez pas cette page</h1>
-      </div>
-      <div id="content">
-        <div class="infobox">
-        <p><b>S'il vous plaît ne fermez pas cette fenêtre tant que vous n'avez 
pas fini de naviguer sur Freenet.</b></p>
-        <p>Afin de garantir une sécurité et des performances maximales, nous 
avons crée ce profil pour Firefox
-        dédié à la navigation sur Freenet. A cause d'un bug dans Firefox si 
vous fermez cette fenêtre avant de fermer 
-        la fenêtre Freenet (celle avec le thème noir, qui devrait s'ouvrir 
dans quelques secondes si ce n'est pas déja fait), 
-        vous ne pourrez peut-être plus relancer Firefox. Si cela se produit, 
fermez la fenêtre Freenet et, si besoin est,
-        redémarrez. Nous essaierons de trouver une meilleure solution pour la 
version 0.8. Merci d'utiliser Freenet.</p>
-        <p><i>L'équipe de développement Freenet</i></p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

Deleted: trunk/apps/new_installer/res/dont-close-me.html
===================================================================
--- trunk/apps/new_installer/res/dont-close-me.html     2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/dont-close-me.html     2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>Please don't close me</title>
-    <link rel="shortcut icon" href="freenet.ico" type="image/x-icon" />
-    <style type="text/css">
-p, span, div, td, th, li, h1, h2, h3, h4, h5 {
-  font-family: Arial;
-  font-weight: normal;
-  font-size: 11pt;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  background-color: #f0f0f0;
-}
-
-/* page's topbar */
-
-#topbar {
-  margin: 0;
-  padding: 5px;
-  min-height: 50px;
-  background-color: #e8e8e8;
-  background-image: url(http://127.0.0.1:8888/static/themes/clean/logo.png);
-  background-repeat: no-repeat;
-  background-position: 30px 3px;
-  border-bottom: 1px solid #d0d0d0;
-}
-
-#topbar h1 {
-  margin: 0;
-  padding: 7px 0 0 0;
-  text-align: center;
-  font-size: 20pt;
-}
-
-/* content */
-
-#content {
-  margin: 10px 50px;
-  padding: 0;
-}
-
-a {
-  color: #000000;
-}
-
-a:hover {
-  color: #ff0000;
-}
-
-abbr {
-  cursor: help;
-  border-bottom: dotted 1px black;
-}
-
-#copyright {
-  font-size: 8pt;
-  text-align: center;
-}
-
-/* infoboxes */
-
-div.infobox {
-  margin: 0 0 5px 0;
-  padding: 10px;
-  background-color: #f0f0f0;
-  border: 1px solid #d0d0d0;
-}
-
-div.infobox div.infobox-header {
-  margin: -10px -10px 10px -10px;
-  padding: 10px 35px 10px 10px;
-  border-bottom: 1px dotted #a0a0a0;
-  font-weight: bold;
-  font-size: 11pt;
-  background-color: #e8e8e8;
-  background-repeat: no-repeat;
-  background-position: right;
-}
-
-#started {
-  font-weight: bold;
-  font-size: 20pt;
-  text-align: center;
-}
-    </style>
-  </head>
-  <body>
-    <div id="page">
-      <div id="topbar">
-        <h1>Please don't close this page</h1>
-      </div>
-      <div id="content">
-        <div class="infobox">
-        <p><b>Please don't close this browser window until you have finished 
browsing Freenet.</b></p>
-        <p>To maximise security and performance, we have created a custom 
profile for
-        Firefox for browsing Freenet. But because of a problem in Firefox, if 
you close
-        this window before you close the Freenet window (with the black theme, 
it should load in a few seconds or may already be loaded), 
-        you may not be able to get back into Firefox. If this happens please 
shutdown the Freenet window and 
-        if necessary reboot. We will try to find a better solution for version 
0.8. Thank you for using Freenet.</p>
-        <p><i>The Freenet Development Team</i></p>
-        <p>If Firefox always opens the freenet profile, you can rectify this 
by finding firefox.exe and running it with the -ProfileManager option.</p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

Modified: trunk/apps/new_installer/res/unix/bin/browse.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/browse.sh     2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh     2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -16,45 +16,4 @@
        sleep 1
 done
 
-browseURL()
-{
-       "`cat firefox.location`" -no-remote -P freenet "$1" &
-}
-
-maybeCreateFFProfile()
-{
-       if test -x "$1"
-       then
-               echo "$1" > firefox.location
-               echo Firefox found, creating a profile for freenet
-               "$1" "file://$INSTALL_PATH/dont-close-me.html" &
-               "$1" -no-remote -CreateProfile "freenet $PWD/firefox_profile" 
>/dev/null
-               browseURL "$URL"
-               exit
-       fi
-}
-
-if test -f firefox.location
-then
-       "`cat firefox.location`" "file://$INSTALL_PATH/dont-close-me.html" &
-       browseURL "$URL"
-else
-       echo Detecting the location of Firefox
-       for name in $POSSIBLE_NAMES
-       do
-               maybeCreateFFProfile "`which $name 2>/dev/null`"
-       done
-
-       if test `uname -s` = "Darwin"
-       then
-               maybeCreateFFProfile 
"$HOME/Applications/Firefox.app/Contents/MacOS/firefox"
-               maybeCreateFFProfile 
"/Applications/Firefox.app/Contents/MacOS/firefox"
-       fi
-
-       echo The installer was unable to locate Mozilla Firefox
-       echo on your computer. Be informed that Freenet *will*
-       echo be slow for you unless you manually configure your
-       echo browser : see "http://freenetproject.org/faq.html#connections";
-       echo for detailed instructions.
-       java -Djava.net.preferIPv4Stack=true -cp bin/browser.jar 
BareBonesBrowserLaunch "$URL" &
-fi
+java -Djava.net.preferIPv4Stack=true -cp bin/browser.jar 
BareBonesBrowserLaunch "$URL" &

Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh   
2009-01-02 13:10:56 UTC (rev 24881)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh   
2009-01-02 14:12:52 UTC (rev 24882)
@@ -38,11 +38,6 @@
 
        chmod u+rx bin/*sh
 
-       if test -f firefox_profile/user.js
-       then
-               cat firefox_profile/user.js | sed "s/8888/$FPROXY_PORT/g" 
>user.js.tmp
-               mv user.js.tmp firefox_profile/user.js
-       fi
 fi
 echo "fproxy.enabled=true" >> freenet.ini
 echo "fproxy.port=$FPROXY_PORT" >> freenet.ini

Deleted: trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh    
2009-01-02 13:10:56 UTC (rev 24881)
+++ trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh    
2009-01-02 14:12:52 UTC (rev 24882)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. "$HOME/_install_toSource.sh" || exit 0
-cd "$INSTALL_PATH"
-
-if test -f firefox_profile.install
-then
-       echo "Downloading the custom firefox profile"
-       if test ! -f offline
-       then
-               java $JOPTS -jar bin/sha1test.jar firefox_profile.zip . 
"$CAFILE" >/dev/null 2>&1 || exit 1
-       fi
-       java $JOPTS -jar bin/uncompress.jar firefox_profile.zip . 2>&1 
>/dev/null
-       rm -f firefox_profile.install
-fi

Deleted: trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd        
2009-01-02 13:10:56 UTC (rev 24881)
+++ trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd        
2009-01-02 14:12:52 UTC (rev 24882)
@@ -1,16 +0,0 @@
-...@set PATH=%SYSTEMROOT%\System32\;%PATH%
-...@set INSTALL_PATH=$INSTALL_PATH
-...@set JAVA_HOME=$JAVA_HOME
-...@set CAFILE=startssl.pem
-...@cd /D %INSTALL_PATH%
-...@if exist .isInstalled goto end
-
-...@if not exist firefox_profile.install goto end
-...@echo Downloading the firefox profile
-...@if exist offline goto end1
-...@java -jar bin\sha1test.jar firefox_profile.zip . %CAFILE% > NUL
-:end1
-...@java -jar bin\uncompress.jar firefox_profile.zip . > NUL
-...@del /F firefox_profile.install > NUL
-
-:end

Modified: trunk/apps/new_installer/res/windows/browse.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/browse.cmd     2009-01-02 13:10:56 UTC 
(rev 24881)
+++ trunk/apps/new_installer/res/windows/browse.cmd     2009-01-02 14:12:52 UTC 
(rev 24882)
@@ -20,12 +20,13 @@
 @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)
 @if not exist firefox.location goto detectff
 @set /P FIREFOX=<firefox.location
 @if not defined FIREFOX goto detectff
-...@start "" /B %FIREFOX% "file:///%INSTALL_PATH%\dont-close-me.html"
-...@start "" /B %FIREFOX% -no-remote -P freenet "%URL%"
+...@start "" /B %FIREFOX% "%URL%"
 @goto realEnd
 
 :detectff
@@ -52,16 +53,11 @@
 @echo "c:\Program Files\Mozilla Firefox\firefox.exe" > firefox.location
 
 :foundff
-:: creation of the profile
-...@echo Creating a Firefox profile for freenet
-...@start "" /B %FIREFOX% "file:///%INSTALL_PATH%\dont-close-me.html"
-...@%firefox% -no-remote -CreateProfile "freenet 
%INSTALL_PATH%\firefox_profile" > NUL
-...@start "" /B %FIREFOX% -no-remote -P freenet "%URL%"
+...@start "" /B %FIREFOX% "%URL%"
 @goto end
 
 :: Firefox hasn't been detected at all
 :noff
-...@echo The installer was unable to locate Mozilla Firefox on your computer
 @del /f firefox.location
 @echo Trying to open "%URL%"
 @start "" "%URL%"
@@ -69,6 +65,8 @@
 @goto end
 :argh
 @echo Starting the page failed, attempting to load directly in IE
+...@echo Do not use Internet Explorer to browse Freenet, it has serious 
security problems
+...@echo Please install an alternative browser ASAP
 @start "" /B "%ProgramFiles%\Internet Explorer\iexplore.exe" "%URL%"
 :end
 @del /f firefox.reg

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to