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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-04-08 12:41:46 +0000 (Sun, 08 Apr 2007)
New Revision: 12552

Modified:
   trunk/apps/new_installer/res/unix/bin/1run.sh
   trunk/apps/new_installer/res/windows/bin/cleanup.cmd
   trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
   trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
Log:
new_installer: spare a few directory creations, don't display Finished

Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh	2007-04-08 11:19:01 UTC (rev 12551)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh	2007-04-08 12:41:46 UTC (rev 12552)
@@ -9,7 +9,3 @@
 
 echo "Starting up a browser"
 java -cp bin/browser.jar BareBonesBrowserLaunch "file://$INSTALL_PATH/welcome.html"
-
-echo "Finished"
-
-exit 0

Modified: trunk/apps/new_installer/res/windows/bin/cleanup.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/cleanup.cmd	2007-04-08 11:19:01 UTC (rev 12551)
+++ trunk/apps/new_installer/res/windows/bin/cleanup.cmd	2007-04-08 12:41:46 UTC (rev 12552)
@@ -5,4 +5,4 @@
 
 :: Keep application installers in case users want to perform updates
 @cd bin
- at del /F 1run.cmd setup.cmd detect_port_availability.cmd install_freenet-ext.cmd install_freenet-stable-latest.cmd install_plugins.cmd install_updater.cmd install_wrapper.cmd setup.cmd > NUL
+ at del /F 1run.cmd setup.cmd detect_port_availability.cmd install_freenet-ext.cmd install_freenet-stable-latest.cmd install_plugins.cmd install_updater.cmd install_wrapper.cmd setup.cmd 2> NUL > NUL

Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-04-08 11:19:01 UTC (rev 12551)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd	2007-04-08 12:41:46 UTC (rev 12552)
@@ -4,11 +4,12 @@
 @cd /D %INSTALL_PATH%
 
 @echo "Setting up plugins"
+ at mkdir plugins 2> NUL
+ at set PLUGINS=
 
 @if not exist stun goto nostun 
 @echo 	-JSTUN
 @set PLUGINS=plugins.JSTUN.JSTUN at file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
- at mkdir plugins 2> NUL
 @java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
 @copy plugins\JSTUN.jar.url plugins\JSTUN.jar > NUL
 @del /F stun > NUL
@@ -17,7 +18,6 @@
 @if not exist mdns goto nomdns 
 @echo 	-MDNSDiscovery
 @set PLUGINS=plugins.MDNSDiscovery.MDNSDiscovery at file:///%INSTALL_PATH%\plugins\MDNSDiscovery.jar;%PLUGINS%
- at mkdir plugins 2> NUL
 @java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar.url plugins > NUL
 @copy plugins\MDNSDiscovery.jar.url plugins\MDNSDiscovery.jar > NUL
 @del /F mdns > NUL
@@ -25,7 +25,6 @@
 
 @if not exist librarian goto nolibrarian 
 @echo 	-Librarian
- at mkdir plugins 2> NUL
 @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

Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd	2007-04-08 11:19:01 UTC (rev 12551)
+++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd	2007-04-08 12:41:46 UTC (rev 12552)
@@ -58,5 +58,3 @@
 @echo "Spawning up a browser"
 @start http://127.0.0.1:%FPROXY_PORT%/
 @start welcome.html
-
- at echo "Finished"