Author: nextgens
Date: 2006-07-27 20:47:19 +0000 (Thu, 27 Jul 2006)
New Revision: 9794
Added:
trunk/apps/new_installer/res/unix/bin/install_jstun.sh
trunk/apps/new_installer/res/windows/bin/install_jstun.cmd
Removed:
trunk/apps/new_installer/res/plugins/
Modified:
trunk/apps/new_installer/TODO
trunk/apps/new_installer/install.xml
Log:
installer: download JSTUN from emu insteed of bundling it, update the TODO
Modified: trunk/apps/new_installer/TODO
===================================================================
--- trunk/apps/new_installer/TODO 2006-07-27 20:35:51 UTC (rev 9793)
+++ trunk/apps/new_installer/TODO 2006-07-27 20:47:19 UTC (rev 9794)
@@ -4,6 +4,4 @@
* more support for unix
* Welcome page
* Fix uninstallation hooks
- * Don't bundle JSTUN but download it
* New packs:
- - auto-update
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-07-27 20:35:51 UTC (rev
9793)
+++ trunk/apps/new_installer/install.xml 2006-07-27 20:47:19 UTC (rev
9794)
@@ -143,6 +143,7 @@
<parsable
targetfile="$INSTALL_PATH\bin\install_jSite.cmd"/>
<parsable
targetfile="$INSTALL_PATH\bin\install_frost.cmd"/>
<parsable
targetfile="$INSTALL_PATH\bin\install_jSite.cmd"/>
+ <parsable
targetfile="$INSTALL_PATH\bin\install_jstun.cmd"/>
<executable
targetfile="$INSTALL_PATH\bin\remove_service.bat" os="windows" keep="true"
stage="uninstall"/>
</pack>
@@ -164,6 +165,7 @@
<parsable
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_frost.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
+ <parsable
targetfile="$INSTALL_PATH/bin/install_jstun.sh"/>
</pack>
<pack name="UninstallStuff" required="no">
<os family="windows"/>
@@ -176,11 +178,8 @@
</pack>
<pack name="STUN" required="no">
<description>A plugin enabling the node to use STUN to
determine your external internet address. Note that this involves contacting an
external server so may be a security risk, however it improves connectivity
significantly for nodes behind a router (i.e. most nodes).</description>
- <fileset dir="res/" targetdir="$INSTALL_PATH">
- <exclude name="*/**/.svn"/>
- <exclude name="*/**/.svn/**"/>
- <include name="plugins/JSTUN.jar"/>
- </fileset>
+ <executable
targetfile="$INSTALL_PATH/bin/install_jstun.sh" type="bin" stage="postinstall"
os="unix"/>
+ <executable
targetfile="$INSTALL_PATH\bin\install_jstun.cmd" type="bin" stage="postinstall"
os="windows"/>
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/stun"/>
</pack>
<pack name="jSite" required="no">
Added: trunk/apps/new_installer/res/unix/bin/install_jstun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jstun.sh 2006-07-27
20:35:51 UTC (rev 9793)
+++ trunk/apps/new_installer/res/unix/bin/install_jstun.sh 2006-07-27
20:47:19 UTC (rev 9794)
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd $INSTALL_PATH/bin
+echo "Downloading JSTUN"
+mkdir ../plugins
+java -jar sha1test.jar JSTUN.jar ../plugins || exit 1
+echo "Done"
Added: trunk/apps/new_installer/res/windows/bin/install_jstun.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jstun.cmd 2006-07-27
20:35:51 UTC (rev 9793)
+++ trunk/apps/new_installer/res/windows/bin/install_jstun.cmd 2006-07-27
20:47:19 UTC (rev 9794)
@@ -0,0 +1,6 @@
+ at echo "Downloading JSTUN"
+ at set PATH=%SYSTEMROOT%\System32\;%PATH%
+ at cd $INSTALL_PATH\bin
+ at mkdir ..\plugins
+ at java -jar sha1test.jar JSTUN.jar ../plugins
+ at echo "Done"
