Author: nextgens
Date: 2006-08-07 14:55:21 +0000 (Mon, 07 Aug 2006)
New Revision: 9949
Removed:
trunk/apps/new_installer/res/windows/bin/install_jstun.cmd
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/1run.sh
trunk/apps/new_installer/res/windows/bin/1run.cmd
Log:
installer: move the STUN downloading process to the processpanel
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-08-07 14:23:48 UTC (rev
9948)
+++ trunk/apps/new_installer/install.xml 2006-08-07 14:55:21 UTC (rev
9949)
@@ -142,7 +142,6 @@
<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>
@@ -177,8 +176,6 @@
</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 with dynamical IP addresses (i.e. most
nodes).</description>
- <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>
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-07 14:23:48 UTC
(rev 9948)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-07 14:55:21 UTC
(rev 9949)
@@ -8,6 +8,7 @@
# Tweak freenet.ini before the first startup
if [[ -e stun ]]
then
+ ./bin/install_jstun.sh
echo "Enabling the STUN plugin"
echo "pluginmanager.loadplugin=plugins.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;" >> freenet.ini
rm -f stun
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-07 14:23:48 UTC
(rev 9948)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-07 14:55:21 UTC
(rev 9949)
@@ -3,28 +3,32 @@
@cd %INSTALL_PATH%
:: Tweak freenet.ini
- at if exist stun echo pluginmanager.loadplugin=plugins.JSTUN at
file:///$INSTALL_PATH\plugins\JSTUN.jar >> freenet.ini
+ at if not exist stun goto nostun
+ at echo pluginmanager.loadplugin=plugins.JSTUN at
file:///$INSTALL_PATH\plugins\JSTUN.jar >> freenet.ini
+ at mkdir plugins
+ at java -jar bin\sha1test.jar JSTUN.jar plugins
@del /F stun > NUL
+:nostun
@if exist update echo node.updater.autoupdate=true >> freenet.ini
@del /F update > NUL
:: Try to detect a free, aviable port for fproxy
@set FPROXY_PORT=8888
- at java -jar bin\bindtest.java %FPROXY_PORT%
+ at java -jar bin\bindtest.jar %FPROXY_PORT%
@if not errorlevel 0 set FPROXY_PORT=8889
@echo fproxy.enable=true >>freenet.ini
@echo fproxy.port=%FPROXY_PORT% >>freenet.ini
:: Try to detect a free, aviable port for fcp
@set FCP_PORT=9481
- at java -jar bin\bindtest.java %FCP_PORT%
+ at java -jar bin\bindtest.jar %FCP_PORT%
@if not errorlevel 0 set FCP_PORT=9482
@echo fcp.enable=true >>freenet.ini
@echo fcp.port=%FCP_PORT% >>freenet.ini
:: Try to detect a free, aviable port for console
@set CONSOLE_PORT=2323
- at java -jar bin\bindtest.java %CONSOLE_PORT%
+ at java -jar bin\bindtest.jar %CONSOLE_PORT%
@if not errorlevel 0 set CONSOLE_PORT=2324
@echo console.enable=true >>freenet.ini
@echo console.port=%CONSOLE_PORT% >>freenet.ini
Deleted: trunk/apps/new_installer/res/windows/bin/install_jstun.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jstun.cmd 2006-08-07
14:23:48 UTC (rev 9948)
+++ trunk/apps/new_installer/res/windows/bin/install_jstun.cmd 2006-08-07
14:55:21 UTC (rev 9949)
@@ -1,6 +0,0 @@
- 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"
