Author: nextgens
Date: 2006-03-30 22:18:42 +0000 (Thu, 30 Mar 2006)
New Revision: 8378
Modified:
trunk/apps/installer/antinstall-config.xml
Log:
installer: don't ask for portnumber anymore, default install directory to
/home/nextgens
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-03-30 21:59:34 UTC (rev
8377)
+++ trunk/apps/installer/antinstall-config.xml 2006-03-30 22:18:42 UTC (rev
8378)
@@ -47,11 +47,19 @@
displayText="Required install options">
<directory
property="installDir"
- defaultValue="/usr/local/freenet"
+ defaultValue="${env.HOME}/freenet"
defaultValueWin="${env.ProgramFiles}\freenet"
displayText="Select an installation directory
(all data in it will be lost!)"
checkExists="true"
create="true"/>
+ <comment
+ displayText="Enter your node name below"/>
+ <validated
+ property="nodeName"
+ displayText="node name :"
+ defaultValue="MyFirstFreenetNode"
+ regex="^[a-zA-Z_0-9 ]+$"
+ force="false"/>
<!-- FIXME: Not yet
<comment
displayText="Enter a password in the field
below"/>
@@ -112,11 +120,19 @@
force="false"/>
</page>
<page
- ifProperty="${l33t}!=2"
+ ifProperty="${l33t}==1"
type="input"
name="config"
displayText="Initial node configuration (1)">
<comment
+ displayText="Enter your host name in the
following field if you want to override ip detection"/>
+
+ <text
+ property="hostName"
+ displayText="Hostname :"
+ defaultValue=""
+ force="false"/>
+ <comment
displayText="Enter your node portnumber in the
following field"/>
<!-- TODO: try to bind it to verify it's free WONTFIX: toad
said : "not needed"-->
<validated
@@ -126,28 +142,6 @@
defaultValue="-1"
force="false"/>
<comment
- displayText="Enter your node name below"/>
- <validated
- property="nodeName"
- displayText="node name :"
- defaultValue="MyFirstFreenetNode"
- regex="^[a-zA-Z_0-9 ]+$"
- force="false"/>
- </page>
- <page
- ifProperty="${l33t}==1"
- type="input"
- name="config"
- displayText="Initial node configuration (2)">
- <comment
- displayText="Enter your host name in the
following field if you want to override ip detection"/>
-
- <text
- property="hostName"
- displayText="Hostname :"
- defaultValue=""
- force="false"/>
- <comment
displayText="How much bandwidth may be used by FRED?"/>
<large-select
property="bw"
@@ -183,7 +177,7 @@
ifProperty="${l33t}==1"
type="input"
name="config"
- displayText="Initial node configuration (4)">
+ displayText="Initial node configuration (2)">
<comment
displayText="Which features should be enabled
?"/>
<checkbox
