Author: nextgens
Date: 2006-08-10 17:55:31 +0000 (Thu, 10 Aug 2006)
New Revision: 10028
Removed:
trunk/apps/new_installer/res/unix/bin/install_jstun.sh
Modified:
trunk/apps/new_installer/TODO
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:
new_installer: bundle the Librarian plugin; Testing will be appreciated,
especially on windows
Modified: trunk/apps/new_installer/TODO
===================================================================
--- trunk/apps/new_installer/TODO 2006-08-10 17:46:49 UTC (rev 10027)
+++ trunk/apps/new_installer/TODO 2006-08-10 17:55:31 UTC (rev 10028)
@@ -4,3 +4,4 @@
* Fix uninstallation hooks
* New packs:
-Freemail
+ -Plugins
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-08-10 17:46:49 UTC (rev
10027)
+++ trunk/apps/new_installer/install.xml 2006-08-10 17:55:31 UTC (rev
10028)
@@ -155,7 +155,6 @@
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/1run.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/1run.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_jstun.sh"/>
</pack>
<pack name="UninstallStuff" required="no">
@@ -168,10 +167,16 @@
<description>Allow 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 with dynamical IP addresses (i.e. most
nodes).</description>
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/stun"/>
</pack>
+
+ <pack name="Librarian" required="no">
+ <description>A plugin allowing you to search the
freenet.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/librarian"/>
+ </pack>
<pack name="jSite" required="no">
<description>A tool to upload websites to
freenet</description>
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-10 17:46:49 UTC
(rev 10027)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-10 17:55:31 UTC
(rev 10028)
@@ -6,13 +6,28 @@
cd "$DST"
# Tweak freenet.ini before the first startup
+PLUGINS=""
if [[ -e stun ]]
then
- chmod +x ./bin/install_jstun.sh ; ./bin/install_jstun.sh &>/dev/null &&
rm -f ./bin/install_jstun.sh
echo "Enabling the STUN plugin"
- echo "pluginmanager.loadplugin=plugins.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;" >> freenet.ini
+ mkdir plugins &>/dev/null
+ PLUGINS="plugins.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS"
+ java -jar bin/sha1test.jar JSTUN.jar plugins &>/dev/null
rm -f stun
fi
+
+if [[ -e librarian ]]
+then
+ echo "Enabling the Librarian plugin"
+ mkdir plugins &>/dev/null
+
PLUGINS="plugins.Librarian@@file://$INSTALL_PATH/plugins/Librarian.jar.url;$PLUGINS"
+ java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
+ rm -f librarian
+fi
+
+# Register plugins
+echo "pluginmanager.loadplugin=$PLUGINS" >> freenet.ini
+
if [[ -e update ]]
then
echo "Enabling the auto-update feature"
Deleted: trunk/apps/new_installer/res/unix/bin/install_jstun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jstun.sh 2006-08-10
17:46:49 UTC (rev 10027)
+++ trunk/apps/new_installer/res/unix/bin/install_jstun.sh 2006-08-10
17:55:31 UTC (rev 10028)
@@ -1,6 +0,0 @@
-#!/bin/bash
-cd $INSTALL_PATH/bin
-echo "Downloading JSTUN"
-mkdir ../plugins
-java -jar sha1test.jar JSTUN.jar ../plugins || exit 1
-echo "Done"
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-10 17:46:49 UTC
(rev 10027)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-10 17:55:31 UTC
(rev 10028)
@@ -4,11 +4,21 @@
:: Tweak freenet.ini
@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 set PLUGINS=plugins.JSTUN at
file:///$INSTALL_PATH\plugins\JSTUN.jar;%PLUGINS%
+ at mkdir plugins > NUL
@java -jar bin\sha1test.jar JSTUN.jar plugins > NUL
@del /F stun > NUL
:nostun
+
+ at if not exist librarian goto nolibrarian
+ at mkdir plugins > NUL
+ at set PLUGINS=plugins.Librarian at
file:///$INSTALL_PATH\plugins\Librarian.jar.url;%PLUGINS%
+ at java -jar bin\sha1test.jar plugins/Librarian.jar.url plugins > NUL
+ at del /F librarian > NUL
+:nolibrarian
+
+ at echo pluginmanager.loadplugin=%PLUGINS% >> freenet.ini
+
@if exist update echo node.updater.autoupdate=true >> freenet.ini
@del /F update > NUL
