[freenet-cvs] r10368 - in trunk/apps/new_installer/res: unix/bin windows/bin

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-09-02 18:10:12 +0000 (Sat, 02 Sep 2006)
New Revision: 10368

Modified:
   trunk/apps/new_installer/res/unix/bin/1run.sh
   trunk/apps/new_installer/res/windows/bin/1run.cmd
Log:
new_installer: fix plugin loading with the new system

Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh       2006-09-02 18:06:40 UTC 
(rev 10367)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh       2006-09-02 18:10:12 UTC 
(rev 10368)
@@ -14,8 +14,8 @@
 then
        echo "Enabling the STUN plugin"
        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
+       PLUGINS="plugins.JSTUN.JSTUN at 
file://$INSTALL_PATH/plugins/JSTUN.jar.url;$PLUGINS"
+       java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins &>/dev/null
        rm -f stun
 fi

@@ -23,7 +23,7 @@
 then
        echo "Enabling the Librarian plugin"
        mkdir plugins &>/dev/null
-       
PLUGINS="plugins.Librarian@@file://$INSTALL_PATH/plugins/Librarian.jar.url;$PLUGINS"
+       PLUGINS="plugins.Librarian.Librarian at 
file://$INSTALL_PATH/plugins/Librarian.jar.url;$PLUGINS"
        java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
        rm -f librarian
 fi

Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd   2006-09-02 18:06:40 UTC 
(rev 10367)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd   2006-09-02 18:10:12 UTC 
(rev 10368)
@@ -26,15 +26,16 @@
 @echo "Setting up plugins"
 :: Tweak freenet.ini
 @if not exist stun goto nostun 
- at set PLUGINS=plugins.JSTUN at 
file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
+ at set PLUGINS=plugins.JSTUN.JSTUN at 
file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
 @mkdir plugins > NUL
- at java -jar bin\sha1test.jar JSTUN.jar plugins > NUL
+ at java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
+ at copy plugins\JSTUN.jar.url plugins\JSTUN.jar > NUL
 @del /F stun > NUL
 :nostun

 @if not exist librarian goto nolibrarian 
 @mkdir plugins > NUL
- at set PLUGINS=plugins.Librarian at 
file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
+ at set PLUGINS=plugins.Librarian.Librarian at 
file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
 @java -jar bin\sha1test.jar plugins/Librarian.jar.url plugins > NUL
 @copy plugins\Librarian.jar.url plugins\Librarian.jar > NUL
 @del /F librarian > NUL