Author: nextgens
Date: 2006-07-27 20:26:37 +0000 (Thu, 27 Jul 2006)
New Revision: 9792
Modified:
trunk/apps/new_installer/Win_shortcutSpec.xml
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/freenet.ini
trunk/apps/new_installer/res/unix/bin/1run.sh
trunk/apps/new_installer/res/windows/bin/1run.cmd
trunk/apps/new_installer/res/windows/bin/remove_service.bat
Log:
installer: fix the stun and the auto-updater pack
Modified: trunk/apps/new_installer/Win_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Win_shortcutSpec.xml 2006-07-27 09:21:15 UTC
(rev 9791)
+++ trunk/apps/new_installer/Win_shortcutSpec.xml 2006-07-27 20:26:37 UTC
(rev 9792)
@@ -52,7 +52,7 @@
</shortcut>
<shortcut
- name="Browse our website"
+ name="Browse http://freenetproject.org";
programGroup="yes"
desktop="no"
applications="no"
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-07-27 09:21:15 UTC (rev
9791)
+++ trunk/apps/new_installer/install.xml 2006-07-27 20:26:37 UTC (rev
9792)
@@ -168,6 +168,10 @@
<description>Create uninstallation hooks in the
registry</description>
<executable
targetfile="$INSTALL_PATH\bin\uninstall_service.bat" os="windows" keep="true"
stage="uninstall"/>
</pack>
+ <pack name="AutoUpdater" required="no">
+ <description>A plugin enabling the node to auto-update
over freenet securely. It's advised that you enable it to keep your node
up-to-date.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/update"/>
+ </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">
@@ -175,6 +179,7 @@
<exclude name="*/**/.svn/**"/>
<include name="plugins/JSTUN.jar"/>
</fileset>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/stun"/>
</pack>
<pack name="jSite" required="no">
<description>A tool to ease the insertion of
freesites</description>
Modified: trunk/apps/new_installer/res/freenet.ini
===================================================================
--- trunk/apps/new_installer/res/freenet.ini 2006-07-27 09:21:15 UTC (rev
9791)
+++ trunk/apps/new_installer/res/freenet.ini 2006-07-27 20:26:37 UTC (rev
9792)
@@ -1,3 +1 @@
-pluginmanager.loadplugin=*@file://$INSTALL_PATH/plugins/JSTUN.jar;
node.updater.enabled=true
-node.updater.autoupdate=true
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-07-27 09:21:15 UTC
(rev 9791)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-07-27 20:26:37 UTC
(rev 9792)
@@ -4,6 +4,18 @@
echo "install: $INSTALL_PATH"
cd "$DST"
+if [[ -e stun ]]
+then
+ echo "Enabling the STUN plugin"
+ echo
"pluginmanager.loadplugin=*@file://$INSTALL_PATH/plugins/JSTUN.jar;" >>
freenet.ini
+ rm -f stun
+fi
+if [[ -e update ]]
+then
+ echo "Enabling the auto-update feature"
+ echo "node.updater.autoupdate=true" >> freenet.ini
+ rm -f update
+fi
echo "Downloading freenet-cvs-snapshot.jar"
java -jar bin/sha1test.jar freenet-cvs-snapshot.jar "$DST" || exit 1
echo "Downloading freenet-ext.jar"
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-07-27 09:21:15 UTC
(rev 9791)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-07-27 20:26:37 UTC
(rev 9792)
@@ -1,5 +1,9 @@
@set PATH=%SYSTEMROOT%\System32\;%PATH%
@cd "$INSTALL_PATH"
+ at if exist stun echo pluginmanager.loadplugin=plugins.JSTUN at
file:///$INSTALL_PATH\plugins\JSTUN.jar >> freenet.ini
+ at del /F stun > NUL
+ at if exist update echo node.updater.autoupdate=true >> freenet.ini
+ at del /F update > NUL
@echo "Downloading freenet-cvs-snapshot.jar"
@java -jar bin\sha1test.jar freenet-cvs-snapshot.jar "$INSTALL_PATH"
@echo "Downloading freenet-ext.jar"
@@ -9,7 +13,7 @@
@bin\wrapper-windows-x86-32.exe -i ../wrapper.conf
@net start freenet-darknet
@echo "Waiting for freenet to startup"
- at ping -n 10 127.0.0.1 >nul
+ at ping -n 5 127.0.0.1 >nul
@echo "Spawing up a browser"
@start http://127.0.0.1:8888
@echo "Finished"
Modified: trunk/apps/new_installer/res/windows/bin/remove_service.bat
===================================================================
--- trunk/apps/new_installer/res/windows/bin/remove_service.bat 2006-07-27
09:21:15 UTC (rev 9791)
+++ trunk/apps/new_installer/res/windows/bin/remove_service.bat 2006-07-27
20:26:37 UTC (rev 9792)
@@ -4,3 +4,4 @@
@net stop freenet-darknet
@echo "Unregistering Freenet as a system service"
@wrapper-windows-x86-32.exe -r ../wrapper.conf
+ at pause
