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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-10-26 19:13:41 +0000 (Fri, 26 Oct 2007)
New Revision: 15597

Modified:
   trunk/apps/new_installer/install.xml
   trunk/apps/new_installer/res/unix/bin/install_librarian.sh
   trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
Log:
new_installer: bundle XMLLibrarian instead of Librarian

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml	2007-10-26 19:08:45 UTC (rev 15596)
+++ trunk/apps/new_installer/install.xml	2007-10-26 19:13:41 UTC (rev 15597)
@@ -254,9 +254,9 @@
 			<singlefile src="res/license/LICENSE.Freenet" target="$INSTALL_PATH/mdns"/>
 		</pack>
 
-		<pack name="Librarian" id="librarian" required="no">
+		<pack name="XMLLibrarian" id="xmllibrarian" required="no">
 			<description>A plugin allowing you to search the freenet.</description>
-			<singlefile src="res/license/LICENSE.Freenet" target="$INSTALL_PATH/librarian"/>
+			<singlefile src="res/license/LICENSE.Freenet" target="$INSTALL_PATH/xmllibrarian"/>
 		</pack>
 		
 		<pack name="jSite" id="jsite" required="no">

Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-10-26 19:08:45 UTC (rev 15596)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-10-26 19:13:41 UTC (rev 15597)
@@ -4,18 +4,18 @@
 
 cd "$INSTALL_PATH"
 
-if test -e librarian -a -e plug
+if test -e xmllibrarian -a -e plug
 then
-	echo "Enabling the Librarian plugin"
+	echo "Enabling the XMLLibrarian plugin"
 	if test ! -e plugins; then mkdir plugins; fi
 	PLUGINS="`cat plug`"
-	echo "plugins.Librarian.Librarian at file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS" > plug2
+	echo "plugins.XMLLibrarian.XMLLibrarian at file://$INSTALL_PATH/plugins/XMLLibrarian.jar;$PLUGINS" > plug2
 	mv -f plug2 plug
 	if test ! -e offline
 	then
-		java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins >/dev/null 2>&1
+		java -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url plugins >/dev/null 2>&1
 	fi
-	mv -f plugins/Librarian.jar.url plugins/Librarian.jar
-	rm -f plugins/Librarian.jar.url
-	rm -f librarian
+	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/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-10-26 19:08:45 UTC (rev 15596)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-10-26 19:13:41 UTC (rev 15597)
@@ -37,14 +37,14 @@
 @del /F upnp > NUL
 :noupnp
 
- at if not exist librarian goto nolibrarian 
- at echo 	-Librarian
- at set PLUGINS=plugins.Librarian.Librarian at file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
+ at if not exist xmllibrarian goto nolibrarian 
+ at echo 	-XMLLibrarian
+ at set PLUGINS=plugins.XMLLibrarian.XMLLibrarian at file:///%INSTALL_PATH%\plugins\XMLLibrarian.jar;%PLUGINS%
 @if exist offline goto end4
- at java -jar bin\sha1test.jar plugins/Librarian.jar.url plugins > NUL
+ at java -jar bin\sha1test.jar plugins/XMLLibrarian.jar.url plugins > NUL
 :end4
- at copy plugins\Librarian.jar.url plugins\Librarian.jar > NUL
- at del /F librarian > NUL
+ at copy plugins\XMLLibrarian.jar.url plugins\XMLLibrarian.jar > NUL
+ at del /F xmllibrarian > NUL
 :nolibrarian
 
 @echo pluginmanager.loadplugin=%PLUGINS% >> freenet.ini