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

nextgens at freenetproject.org nextgens at freenetproject.org
Sun Nov 11 10:37:50 UTC 2007


Author: nextgens
Date: 2007-11-11 10:37:50 +0000 (Sun, 11 Nov 2007)
New Revision: 15755

Modified:
   trunk/apps/new_installer/res/unix/bin/install_librarian.sh
   trunk/apps/new_installer/res/unix/bin/install_mdns.sh
   trunk/apps/new_installer/res/unix/bin/install_stun.sh
   trunk/apps/new_installer/res/unix/bin/install_upnp.sh
   trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
Log:
new_installer: make it compatible with the new plugin system

Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-11-11 03:42:16 UTC (rev 15754)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-11-11 10:37:50 UTC (rev 15755)
@@ -9,13 +9,11 @@
 	echo "Enabling the XMLLibrarian plugin"
 	if test ! -e plugins; then mkdir plugins; fi
 	PLUGINS="`cat plug`"
-	echo "plugins.XMLLibrarian.XMLLibrarian at file://$INSTALL_PATH/plugins/XMLLibrarian.jar;$PLUGINS" > plug2
+	echo "XMLLibrarian;$PLUGINS" > plug2
 	mv -f plug2 plug
 	if test ! -e offline
 	then
 		java -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url plugins >/dev/null 2>&1
 	fi
-	mv -f plugins/XMLLibrarian.jar.url plugins/XMLLibrarian.jar
-	rm -f plugins/XMLLibrarian.jar.url
 	rm -f xmllibrarian
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh	2007-11-11 03:42:16 UTC (rev 15754)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh	2007-11-11 10:37:50 UTC (rev 15755)
@@ -9,13 +9,11 @@
 	echo "Enabling the MDNSDiscovery plugin"
 	if test ! -e plugins; then mkdir plugins; fi 2>&1 >/dev/null
 	PLUGINS="`cat plug`"
-	echo "plugins.MDNSDiscovery.MDNSDiscovery at file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS" > plug2
+	echo "MDNSDiscovery;$PLUGINS" > plug2
 	mv -f plug2 plug
 	if test ! -e offline
 	then
 		java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url plugins >/dev/null 2>&1
 	fi
-	mv -f plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
-	rm -f plugins/MDNSDiscovery.jar.url
 	rm -f mdns
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh	2007-11-11 03:42:16 UTC (rev 15754)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh	2007-11-11 10:37:50 UTC (rev 15755)
@@ -9,13 +9,11 @@
 	echo "Enabling the STUN plugin"
 	if test ! -e plugins; then mkdir plugins; fi
 	PLUGINS="`cat plug`"
-	echo "plugins.JSTUN.JSTUN at file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS" > plug2
+	echo "JSTUN;$PLUGINS" > plug2
 	mv -f plug2 plug
 	if test ! -e offline
 	then
 		java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins >/dev/null 2>&1
 	fi
-	mv -f plugins/JSTUN.jar.url plugins/JSTUN.jar
-	rm -f plugins/JSTUN.jar.url
 	rm -f stun
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh	2007-11-11 03:42:16 UTC (rev 15754)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh	2007-11-11 10:37:50 UTC (rev 15755)
@@ -9,13 +9,11 @@
 	echo "Enabling the UP&P plugin"
 	if test ! -e plugins; then mkdir plugins; fi
 	PLUGINS="`cat plug`"
-	echo "plugins.UPnP.UPnP at file://$INSTALL_PATH/plugins/UPnP.jar;$PLUGINS" > plug2
+	echo "UPnP;$PLUGINS" > plug2
 	mv -f plug2 plug
 	if test ! -e offline
 	then
 		java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins >/dev/null 2>&1
 	fi
-	mv -f plugins/UPnP.jar.url plugins/UPnP.jar
-	rm -f plugins/UPnP.jar.url
 	rm -f upnp
 fi

Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-11-11 03:42:16 UTC (rev 15754)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-11-11 10:37:50 UTC (rev 15755)
@@ -9,41 +9,37 @@
 
 @if not exist stun goto nostun 
 @echo 	-JSTUN
- at set PLUGINS=plugins.JSTUN.JSTUN at file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
+ at set PLUGINS=JSTUN;%PLUGINS%
 @if exist offline goto end1
 @java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
 :end1
- at copy plugins\JSTUN.jar.url plugins\JSTUN.jar > NUL
 @del /F stun > NUL
 :nostun
 
 @if not exist mdns goto nomdns 
 @echo 	-MDNSDiscovery
- at set PLUGINS=plugins.MDNSDiscovery.MDNSDiscovery at file:///%INSTALL_PATH%\plugins\MDNSDiscovery.jar;%PLUGINS%
+ at set PLUGINS=MDNSDiscovery;%PLUGINS%
 @if exist offline goto end2
 @java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar.url plugins > NUL
 :end2
- at copy plugins\MDNSDiscovery.jar.url plugins\MDNSDiscovery.jar > NUL
 @del /F mdns > NUL
 :nomdns
 
 @if not exist upnp goto noupnp 
 @echo 	-UPnP
- at set PLUGINS=plugins.UPnP.UPnP at file:///%INSTALL_PATH%\plugins\UPnP.jar;%PLUGINS%
+ at set PLUGINS=UPnP;%PLUGINS%
 @if exist offline goto end3
 @java -jar bin\sha1test.jar plugins/UPnP.jar.url plugins > NUL
 :end3
- at copy plugins\UPnP.jar.url plugins\UPnP.jar > NUL
 @del /F upnp > NUL
 :noupnp
 
 @if not exist xmllibrarian goto nolibrarian 
 @echo 	-XMLLibrarian
- at set PLUGINS=plugins.XMLLibrarian.XMLLibrarian at file:///%INSTALL_PATH%\plugins\XMLLibrarian.jar;%PLUGINS%
+ at set PLUGINS=XMLLibrarian;%PLUGINS%
 @if exist offline goto end4
 @java -jar bin\sha1test.jar plugins/XMLLibrarian.jar.url plugins > NUL
 :end4
- at copy plugins\XMLLibrarian.jar.url plugins\XMLLibrarian.jar > NUL
 @del /F xmllibrarian > NUL
 :nolibrarian
 




More information about the cvs mailing list