Author: nextgens
Date: 2008-06-04 15:46:56 +0000 (Wed, 04 Jun 2008)
New Revision: 20199
Removed:
trunk/apps/new_installer/res/welcome.chn.html
trunk/apps/new_installer/res/welcome.deu.html
trunk/apps/new_installer/res/welcome.fra.html
trunk/apps/new_installer/res/welcome.html
Modified:
trunk/apps/new_installer/install.xml
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: do not open the browser until the install process is over
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-06-04 13:20:29 UTC (rev
20198)
+++ trunk/apps/new_installer/install.xml 2008-06-04 15:46:56 UTC (rev
20199)
@@ -64,6 +64,7 @@
<variables>
<variable name="DesktopShortcutCheckboxEnabled" value="true" />
+ <variable name="InstallerFrame.logfilePath"
value="$INSTALL_PATH/Uninstaller/install.log" />
<variable name="app-version" value="0.7.0 "Darknet""/>
<variable name="released-on" value="Thursday 8 May 2008"/>
</variables>
@@ -117,8 +118,6 @@
<include name="firefox_profile/**/*"/>
<include name="wrapper.conf"/>
<include name="startssl.pem"/>
- <include name="welcome.html"/>
- <include name="welcome.*.html"/>
<include name="dont-close-me.html"/>
<include name="dont-close-me*.html"/>
</fileset>
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2008-06-04 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -10,5 +10,4 @@
echo "Starting Freenet 0.7..."
nohup sh ./run.sh start 2>&1 >wrapper.log &
-echo "Starting up a browser"
-sh ./bin/browse.sh "file://$INSTALL_PATH/welcome.html"
+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 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -10,6 +10,13 @@
URL="$1"
fi
+# Wait until the installer has finished
+while test ! -f Uninstaller/install.log
+do
+ URL="http://127.0.0.1:8888/wizard/";
+ sleep 1
+done
+
browseURL()
{
"`cat firefox.location`" -no-remote -P freenet "$1" &
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 13:20:29 UTC (rev 20198)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-06-04 15:46:56 UTC (rev 20199)
@@ -48,16 +48,6 @@
echo "fproxy.port=$FPROXY_PORT" >> freenet.ini
# Translate if needed
-FILE="welcome.html"
-if test -e welcome.$ISO3_LANG.html
-then
- FILE="welcome.$ISO3_LANG.html"
-fi
-cat "$FILE" | sed "s/8888/$FPROXY_PORT/g" >_welcome.html
-rm -f welcome.*html
-mv _welcome.html welcome.html
-
-# Translate if needed
FILE="dont-close-me.html"
if test -e dont-close-me.$ISO3_LANG.html
then
Deleted: trunk/apps/new_installer/res/welcome.chn.html
===================================================================
--- trunk/apps/new_installer/res/welcome.chn.html 2008-06-04 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/welcome.chn.html 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -1,127 +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>Successful installation of Freenet 0.7!</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>Freenet 0.7 ?????</h1>
- </div>
- <div id="content">
- <div class="infobox">
- <div class="infobox-header">?????????????????</div>
- <p>??????<a href="http://127.0.0.1:8888/wizard/";>Freenet
??????</a>????????????<abbr title="?????? Freenet
???????">??</abbr>????????????????????</p>
- <p>????????????????????Freenet ?????????????</p>
- <p>???????????? Freenet ???????????????????????????????????
- ??????????????<a
href="http://127.0.0.1:8888/friends/myref.fref";>????</a>????????????????????<a
href="http://127.0.0.1:8888/friends/";>??</a>????<b>??</b>????????????????????????????????<a
href="http://wiki.freenetproject.org";>Freenet ????</a>??<a
href="http://wiki.freenetproject.org/FreenetConnections";>Freenet
??(??)</a>??</p>
- <p>?????????????<a href="http://en.wikipedia.org/wiki/IRC";
title="Internet Relay Chat is a non-anonymous chat system used by many
developers and users of Freenet">IRC</a>? irc.freenode.net ?? <a
href="irc://irc.freenode.net/freenet">#freenet</a> ????????????<a
href="mailto:support at freenetproject.org">??????</a>?</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">? Freenet ???</div>
- <p>?????????<a href="http://127.0.0.1:8888/";>??</a>????????<abbr
title="? Freenet ?????? freesites">freesites</abbr>????????????? Freenet
?????</p>
- <p>?????????????? (?? Frost) ????????????????????? Frost ???</p>
- <p>????? Freenet ????????????? JSite ?????? Freesite ????????</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">??????????? Freenet ?</div>
- <p>???? Freenet ?????????? Freenet
??????????????????????????????????????????????</p>
- <p>Freenet ????????????????????????????<a
href="http://freenetproject.org/donate.html";>?????</a>???????????????????</p>
- <p>????????????</p>
- </div>
- </div>
- </div>
- <div id="started">
- <a href="http://127.0.0.1:8888/wizard/";>Get started on Freenet!</a>
- </div>
- <div id="copyright"><p>?????? <a
href="http://www.gnu.org/licenses/fdl.html";>GNU Free Documentation License</a>
?????</p></div>
- </body>
-</html>
Deleted: trunk/apps/new_installer/res/welcome.deu.html
===================================================================
--- trunk/apps/new_installer/res/welcome.deu.html 2008-06-04 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/welcome.deu.html 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -1,128 +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>Erfolgreiche Installation von Freenet 0.7!</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>Freenet 0.7 Installation Erfolgreich!</h1>
- </div>
- <div id="content">
- <div class="infobox">
- <div class="infobox-header">N?chster Schritt: konfigurieren Sie
Ihren Knoten und verbinden Sie ihn mit dem Netzwerk.</div>
- <p>Der n?chste Schritt ist, den <a
href="http://127.0.0.1:8888/wizard/";>Einrichtungs-Assistenten</a> aufzurufen.
Von dort aus k?nnen Sie den Status Ihres <abbr title="Ein Knoten ist ein
einzelner Punkt im Freenet-Netzwerk, repr?sentiert durch einen einzelnen
Computer.">Knotens</abbr> sehen und Einstellungen machen, einschlie?lich eines
menschen-lesbaren Namen f?r Ihren Knoten.</p>
- <p>Wenn Sie Ihren Knoten konfigurieren sich automatisch mit nicht
vertrauensw?rdigen Knoten (Fremden) zu verbinden, dann sollte er sich innerhalb
weniger Minuten automatisch mit dem Netzwerk verbinden.</p>
- <p>Wenn Sie Leute kennen, die Freenet benutzen, fragen Sie sie nach
ihren Knoten-Referenzen: Wenn Sie sich nur mit Ihren Freunden verbinden wird
dies die Sicherheit deutlich erh?hen.
- Um eine Verbindung mit einem anderen Knoten herzustellen, senden Sie
ihm Ihre <a href="http://127.0.0.1:8888/friends/myref.fref";>Knoten-Referenz</a>
und f?gen Sie seine auf der <a
href="http://127.0.0.1:8888/friends/";>Freunde</a>-Seite hinzu. Wenn <b>beide
Seiten</b> die Knoten-Referenz des anderen hinzugef?gt haben, sollten sie sich
verbinden. Wenn Sie Schwierigkeiten haben, wenden Sie sich an die <a
href="http://wiki.freenetproject.org/FreenetConnections";>Freenet
Connections</a>-Seite im <a
href="http://wiki.freenetproject.org";>Freenet-Projekt-Wiki</a>.</p>
- <p>Wenn Sie irgendwelche Probleme haben, kontaktieren Sie uns im <a
href="http://de.wikipedia.org/wiki/IRC"; title="Internet Relay Chat ist ein
nicht-anonymes Chat-System, das von vielen Benutzern und Entwicklern von
Freenet benutzt wird">IRC</a> in <a
href="irc://irc.freenode.net/freenet-de">#freenet-de</a> oder <a
href="irc://irc.freenode.net/freenet">#freenet (Englisch)</a> auf
irc.freenode.net,
- oder auf der <a href="mailto:support at
freenetproject.org">Support-Mailing-Liste</a>.</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Freenet erkunden und etwas
beisteuern</div>
- <p>Sie k?nnen beginnen <abbr title="Webseiten im Freenet werden
Freesites genannt.">Freesites</abbr> anzusehen, indem Sie eines der Lezezeichen
auf der <a href="http://127.0.0.1:8888/";>Startseite</a> verwenden. Von dort aus
k?nnen Sie eine gro?e Anzahl der Inhalte im Freenet ansehen.</p>
- <p>Sie k?nnen auch in der anonymen Nachrichten-Anwendung Frost
st?bern und Nachrichten schreiben. Diese ist ?ber das "Frost"-Desktop-Symbol
erreichbar, wenn Sie ausgew?hlt haben es zu installieren.</p>
- <p>Sobald Sie ein paar der Inhalte, die sich schon im Freenet
befinden, gesehen haben, k?nnen Sie versuchen JSite zu benutzen um Ihre eigenen
Freesites zu erstellen, die andere ansehen k?nnen!</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Wir danken Ihnen noch ein Mal, dass Sie
Freenet benutzen!</div>
- <p>Denken Sie daran, Im Freenet geht es um die Freie
(Meinungs-)?u?erung. Sie werden vielleicht Inhalte im Freenet finden, die Sie
f?r absto?end oder inakzeptabel halten. Wenn Ihnen dies ein Anliegen ist, dann
w?hlen Sie sorgf?ltig welchen Links Sie vertrauen und welche Indizes und
Freesites Sie herunterladen.</p>
- <p>Das Freenet-Projekt besch?ftigt einen Vollzeit-Entwickler. Wenn
Sie k?nnen, w?ren wir Ihnen sehr dankbar wenn Sie dem Projekt etwas <a
href="http://freenetproject.org/donate.html";>spenden</a>, sodass wir ihn
weiterhin besch?ftigen und unsere Software verbessern lassen k?nnen.</p>
- <p>Wir w?nschen Ihnen ein angenehmes Erlebnis in der freien Welt!</p>
- </div>
- </div>
- </div>
- <div id="started">
- <a href="http://127.0.0.1:8888/wizard/";>Beginnen Sie im Freenet!</a>
- </div>
- <div id="copyright"><p>Diese Seite steht unter der <a
href="http://www.gnu.org/licenses/fdl.html";>"GNU Free
Documentation"-Lizenz</a></p></div>
- </body>
-</html>
Deleted: trunk/apps/new_installer/res/welcome.fra.html
===================================================================
--- trunk/apps/new_installer/res/welcome.fra.html 2008-06-04 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/welcome.fra.html 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -1,128 +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="fr" xml:lang="fr">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Installation de Freenet 0.7 R?ussie !</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>Installation de Freenet 0.7 R?ussie !</h1>
- </div>
- <div id="content">
- <div class="infobox">
- <div class="infobox-header">Maintenant, configurez votre noeud et
connectez-le au r?seau.</div>
- <p>La prochaine ?tape est d'utiliser l'<a
href="http://127.0.0.1:8888/wizard/";>Assistant premiers pas</a>. A partir de
l?, vous pourrez configurer votre <abbr title="Un noeud est un ordinateur
faisant partie du r?seau Freenet.">noeud</abbr> et lui donner un nom.</p>
- <p>Si vous choisissez de vous connecter ? des inconnus, votre
noeud sera connect? au r?seau en quelques minutes.</p>
- <p>Si vous connaissez des gens qui utilisent Freenet,
demandez-leur la r?f?rence de leur noeud : si vous ne vous connectez qu'? des
amis, vous aurez une bien meilleure s?curit?.
- Pour vous connecter ? un ami, donnez-lui votre <a
href="http://127.0.0.1:8888/friends/myref.fref";>r?f?rence</a> et ajoutez la
sienne sur la page des <a href="http://127.0.0.1:8888/friends/";>Amis</a>. Quand
vous aurez <b>tous les deux</b> ajout? la r?f?rence de l'autre, vos noeuds
seront connect?s. Si vous avez des difficult?s, consultez la page <a
href="http://wiki.freenetproject.org/FreenetConnectionsFR";>Les connexions</a>
sur le <a href="http://wiki.freenetproject.org";>Wiki du projet Freenet</a>.</p>
- <p>Si vous avez des probl?mes, contactez-nous sur l'<a
href="http://en.wikipedia.org/wiki/IRC"; title="Le chat IRC n'est pas anonyme
mais il est utilis? par de nombreux d?veloppeurs et utilisateurs de
Freenet">IRC</a> sur <a
href="irc://irc.freenode.net/freenet-fr">#freenet-fr</a> sur irc.freenode.net,
- ou par la <a href="mailto:support at freenetproject.org">mailing
list de support</a>.</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Explorez Freenet et contribuez</div>
- <p>Vous pouvez commencer par visiter les <abbr title="Les sites web
sur Freenet sont appel?s des freesites.">freesites</abbr> en utilisant les
marque-pages pr?sents sur la <a href="http://127.0.0.1:8888/";>page
d'accueil</a>. En partant de l?, vous aurez acc?s ? une grande partie du
contenu de Freenet.</p>
- <p>Vous pouvez discuter ? l'aide des syst?mes de discussion anonyme
Frost et Thaw. Ils sont accessibles par leurs ic?nes sur votre bureau si vous
les avez install?s.</p>
- <p>Une fois que vous aurez un peu explor? Freenet, vous pourrez
utiliser jSite pour ins?rer votre propre site afin que les autres puissent le
visiter.</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Une fois encore, merci d'utiliser
Freenet !</div>
- <p>Rappelez-vous que Freenet sert la libert? d'expression. Vous
risquez de trouver des choses choquantes ou que vous jugez inacceptables. Si
cela vous pose un probl?me, choisissez soigneusement les liens et les sites que
vous consultez.</p>
- <p>Le Projet Freenet emploie un d?veloppeur ? plein-temps. Si vous
le pouvez, nous appr?cierions une <a
href="http://freenetproject.org/donate.html";>donation</a> afin de pouvoir
continuer ? le payer pour am?liorer le logiciel.</p>
- <p>Nous vous souhaitons une agr?able d?couverte du mode libre !</p>
- </div>
- </div>
- </div>
- <div id="started">
- <a href="http://127.0.0.1:8888/wizard/";>D?buter sur Freenet !</a>
- </div>
- <div id="copyright"><p>Cette page est difus?e sous <a
href="http://www.gnu.org/licenses/fdl.html";>GNU Free Documentation
License</a></p></div>
- </body>
-</html>
Deleted: trunk/apps/new_installer/res/welcome.html
===================================================================
--- trunk/apps/new_installer/res/welcome.html 2008-06-04 13:20:29 UTC (rev
20198)
+++ trunk/apps/new_installer/res/welcome.html 2008-06-04 15:46:56 UTC (rev
20199)
@@ -1,128 +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>Successful installation of Freenet 0.7!</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>Freenet 0.7 Installation Successful!</h1>
- </div>
- <div id="content">
- <div class="infobox">
- <div class="infobox-header">Next, configure your node and connect
your node to the network.</div>
- <p>The next step is to access the <a
href="http://127.0.0.1:8888/wizard/";>First time wizard</a>. From there, you
can view the status of your <abbr title="A node is a single point on the
Freenet network represented by a single computer.">node</abbr> and set
configuration options including a human-readable name for your node.</p>
- <p>If you configure your node to automatically connect to untrusted
nodes (Strangers), then it should automatically connect to the network within a
few minutes.</p>
- <p>If you know people using Freenet, ask them for their noderefs: If
you only connect to your Friends this will greatly improve security.
- To create a link with another node, send them your <a
href="http://127.0.0.1:8888/friends/myref.fref";>noderef</a> and add theirs on
the <a href="http://127.0.0.1:8888/friends/";>friends</a> page. When <b>both
ends</b> have added the other's noderef they should connect. If you are having
difficulties refer to the <a
href="http://wiki.freenetproject.org/FreenetConnections";>Freenet
Connections</a> page on the <a href="http://wiki.freenetproject.org";>Freenet
Project Wiki</a>.</p>
- <p>If you have any problems, please contact us on <a
href="http://en.wikipedia.org/wiki/IRC"; title="Internet Relay Chat is a
non-anonymous chat system used by many developers and users of Freenet">IRC</a>
on <a href="irc://irc.freenode.net/freenet">#freenet</a> on irc.freenode.net,
- or the <a href="mailto:support at freenetproject.org">support mailing
list</a>.</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Explore and contribute to Freenet</div>
- <p>You can start browsing <abbr title="Websites on Freenet are
called freesites.">freesites</abbr> using one of the bookmarks listed on the <a
href="http://127.0.0.1:8888/";>homepage</a>. From there, you can view a large
amount of the content on Freenet.</p>
- <p>You can also browse and post in the anonymous message board
application, Frost. This is accessible through the 'Frost' desktop icon if you
chose to install it.</p>
- <p>Once you've seen some of the content already on Freenet, you
could try using JSite to create your own Freesite for others to browse!</p>
- </div>
-
- <div class="infobox">
- <div class="infobox-header">Once again, thank you for using
Freenet!</div>
- <p>Remember, Freenet is all about freedom of speech. You may find
content on Freenet that you consider offensive or unacceptable. If this
concerns you, then consider carefully what links you trust and what indexes and
freesites you fetch.</p>
- <p>The Freenet Project employs a full-time developer. If you can,
we would appreciate it if could <a
href="http://freenetproject.org/donate.html";>donate to the project</a> so that
we can continue to employ him and keep on improving our software.</p>
- <p>We wish you a pleasant experience in the free world!</p>
- </div>
- </div>
- </div>
- <div id="started">
- <a href="http://127.0.0.1:8888/wizard/";>Get started on Freenet!</a>
- </div>
- <div id="copyright"><p>This page is licensed under the <a
href="http://www.gnu.org/licenses/fdl.html";>GNU Free Documentation
License</a></p></div>
- </body>
-</html>
Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
2008-06-04 13:20:29 UTC (rev 20198)
+++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
2008-06-04 15:46:56 UTC (rev 20199)
@@ -13,14 +13,6 @@
@if %ERRORLEVEL% EQU 0 goto configure_fproxy
@set FPROXY_PORT=8889
- at set WELCOME_FILE=welcome.html
- at if not exist welcome.%ISO3_LANG%.html goto noWl10n
- at set WELCOME_FILE=welcome.%ISO3_LANG%.html
-:noWl10n
- at bin\cat.exe %WELCOME_FILE% | bin\sed.exe "s/8888/%FPROXY_PORT%/g" >
_welcome.html
- at del /F /Q welcome.*html
- at move /Y _welcome.html welcome.html > NUL
-
@set DONTCLOSE_FILE=dont-close-me.html
@if not exist dont-close-me.%ISO3_LANG%.html goto noDl10n
@set DONTCLOSE_FILE=dont-close-me.%ISO3_LANG%.html
@@ -118,7 +110,6 @@
@echo - Start the node up
@net start freenet-darknet-%FPROXY_PORT%
- at echo Spawning up a browser
- at browse welcome.html
+ at start "" /B "browse"
:endl10n
:end
Modified: trunk/apps/new_installer/res/windows/browse.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/browse.cmd 2008-06-04 13:20:29 UTC
(rev 20198)
+++ trunk/apps/new_installer/res/windows/browse.cmd 2008-06-04 15:46:56 UTC
(rev 20199)
@@ -13,6 +13,14 @@
@set URL="%1"
:doneURL
+:: Loop until the install process is over
+:beforeLoop
+ at if exist Uninstaller/install.log goto begin
+ at set URL="http://127.0.0.1:8888/wizard/";
+ at ping -n 1 127.0.0.1>NUL
+ at goto beforeLoop
+:begin
+
:: Check the simple case first (FF exists and has been detected)
@if not exist firefox.location goto detectff
@set /P FIREFOX=<firefox.location
