Author: nextgens
Date: 2006-04-05 19:55:47 +0000 (Wed, 05 Apr 2006)
New Revision: 8471
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/linux/update.sh
Log:
installer: new version with improved update script on linux and jSite
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-04-05 12:39:51 UTC (rev
8470)
+++ trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev
8471)
@@ -119,6 +119,11 @@
displayText="Frost"
defaultValue="true"
force="false"/>
+ <checkbox
+ property="jSite"
+ displayText="jSite"
+ defaultValue="true"
+ force="false"/>
</page>
<page
ifProperty="${l33t}==1"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-04-05 12:39:51 UTC (rev 8470)
+++ trunk/apps/installer/build.xml 2006-04-05 19:55:47 UTC (rev 8471)
@@ -76,11 +76,11 @@
<equals arg1="${enableConsole}" arg2=""/>
</condition>
<condition property="skip_frost" value="true">
- <or>
- <equals arg1="${frost}" arg2="false"/>
- <equals arg1="${frost}" arg2=""/>
- </or>
+ <equals arg1="${frost}" arg2="false"/>
</condition>
+ <condition property="skip_jSite" value="true">
+ <equals arg1="${jSite}" arg2="false"/>
+ </condition>
<echo message="Name: ${Name}"/>
<echo message="Bandwidth: ${Bandwidth}"/>
<echo message="Port: ${Port}"/>
@@ -93,6 +93,7 @@
<echo message="Fproxy: ${Fproxy}"/>
<echo message="Console: ${Console}"/>
<echo message="Frost: ${frost}"/>
+ <echo message="jSite: ${jSite}"/>
</target>
@@ -117,7 +118,7 @@
</replace>
</target>
- <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,start_browser">
+ <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,jSite,start_browser">
</target>
<target name="copy">
@@ -188,11 +189,10 @@
</replace>
<copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
- <chmod file="${installDir}/update.sh" perm="755"/>
-
<replace file="${installDir}/update.sh">
- <replacefilter token="@path@" value="/${basedir}/"/>
+ <replacefilter token="@path@" value="/${installDir}/"/>
</replace>
+ <chmod file="${installDir}/update.sh" perm="755"/>
<echo message="Creating shortcuts"/>
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="755"/>
@@ -223,11 +223,10 @@
</replace>
<copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
- <chmod file="${installDir}/update.sh" perm="755"/>
-
<replace file="${installDir}/update.sh">
- <replacefilter token="@path@" value="/${basedir}/"/>
+ <replacefilter token="@path@" value="/${installDir}/"/>
</replace>
+ <chmod file="${installDir}/update.sh" perm="755"/>
<echo message="Creating shortcuts"/>
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="755"/>
@@ -265,6 +264,15 @@
<untar src="${basedir}/frost.tbz" dest="${installDir}"
compression="bzip2"/>
</target>
+ <target name="jSite" unless="skip_jSite">
+ <echo message="Downloading jSite"/>
+
+ <java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="true" fork="true" resultproperty="frost.verified" logError="true">
+ <arg value="jSite/jSite.jar"/>
+ </java>
+ <copy file="${basedir}/jSite.jar"
tofile="${installDir}/jSite.jar"/>
+ </target>
+
<target name="tgmain" >
<echo message="Downloading core components"/>
<java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="true" fork="true" resultproperty="freenet-cvs-snapshot.verified"
logError="true">
Modified: trunk/apps/installer/installclasspath/linux/update.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05
12:39:51 UTC (rev 8470)
+++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05
19:55:47 UTC (rev 8471)
@@ -18,10 +18,16 @@
echo "Your freenet node is up to date"
fi
-wget --no-check-certificate -o /dev/null
https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh
-O update2.sh
-chmod +x update2.sh
-LOCATION="$(pwd | sed -e 's/\//\\\//g')"
-# we need to escape it, thanks to the_JinX for the hack
-echo @path@ >/dev/null && sed -e "s/@path@/$LOCATION/" update2.sh > update.sh
+wget -N -o /dev/null
https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh
-O update2.sh
+diff --brief update.sh update2.sh
+if [[ $? -ne 0 ]]
+then
+ LOCATION="$(pwd | sed -e 's/\//\\\//g')"
+ # we need to escape it, thanks to the_JinX for the hack
+ WHAT="@pa"
+ WHAT2="th@"
+ cat update2.sh |sed "s/$WHAT$WHAT2/$LOCATION/" > update.sh
+ chmod +x update.sh
+fi
popd 2>&1 >/dev/null
