Author: toad
Date: 2008-04-21 13:51:29 +0000 (Mon, 21 Apr 2008)
New Revision: 19475
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:
Fix the installer: download the .jar.url, so that the .sha1 verification works.
Then rename it to .jar so that the node picks it up.
This should fix the "it takes aaaaages to download each plugin" bug in the
installer.
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-04-21
13:17:01 UTC (rev 19474)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-04-21
13:51:29 UTC (rev 19475)
@@ -12,7 +12,8 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/XMLLibrarian.jar
plugins >/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url
plugins >/dev/null 2>&1
+ mv plugins/XMLLibrarian.jar.url plugins/XMLLibrarian.jar
fi
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 2008-04-21
13:17:01 UTC (rev 19474)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-04-21
13:51:29 UTC (rev 19475)
@@ -12,7 +12,8 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/MDNSDiscovery.jar
plugins >/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins >/dev/null 2>&1
+ mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
fi
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 2008-04-21
13:17:01 UTC (rev 19474)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-04-21
13:51:29 UTC (rev 19475)
@@ -12,7 +12,8 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/JSTUN.jar plugins
>/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
>/dev/null 2>&1
+ mv plugins/JSTUN.jar.url plugins/JSTUN.jar
fi
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 2008-04-21
13:17:01 UTC (rev 19474)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-04-21
13:51:29 UTC (rev 19475)
@@ -12,7 +12,8 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/UPnP.jar plugins
>/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
>/dev/null 2>&1
+ mv plugins/UPnP.jar.url plugins/UPnP.jar
fi
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
2008-04-21 13:17:01 UTC (rev 19474)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2008-04-21 13:51:29 UTC (rev 19475)
@@ -11,7 +11,8 @@
@echo -JSTUN
@set PLUGINS=JSTUN;%PLUGINS%
@if exist offline goto end1
- at java -jar bin\sha1test.jar plugins/JSTUN.jar plugins > NUL
+ at java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
+ at rename plugins/JSTUN.jar.url plugins/JSTUN.jar
:end1
@del /F stun > NUL
:nostun
@@ -20,7 +21,8 @@
@echo -MDNSDiscovery
@set PLUGINS=MDNSDiscovery;%PLUGINS%
@if exist offline goto end2
- at java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar plugins > NUL
+ at java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar.url plugins > NUL
+ at rename plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
:end2
@del /F mdns > NUL
:nomdns
@@ -29,7 +31,8 @@
@echo -UPnP
@set PLUGINS=UPnP;%PLUGINS%
@if exist offline goto end3
- at java -jar bin\sha1test.jar plugins/UPnP.jar plugins > NUL
+ at java -jar bin\sha1test.jar plugins/UPnP.jar.url plugins > NUL
+ at rename plugins/UPnP.jar.url plugins/UPnP.jar
:end3
@del /F upnp > NUL
:noupnp
@@ -38,7 +41,8 @@
@echo -XMLLibrarian
@set PLUGINS=XMLLibrarian;%PLUGINS%
@if exist offline goto end4
- at java -jar bin\sha1test.jar plugins/XMLLibrarian.jar plugins > NUL
+ at java -jar bin\sha1test.jar plugins/XMLLibrarian.jar.url plugins > NUL
+ at rename plugins/XMLLibrarian.jar.url plugins/XMLLibrarian.jar
:end4
@del /F xmllibrarian > NUL
:nolibrarian
