Author: nextgens Date: 2007-06-17 20:08:49 +0000 (Sun, 17 Jun 2007) New Revision: 13637
Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd trunk/apps/new_installer/res/windows/bin/install_frost.cmd trunk/apps/new_installer/res/windows/bin/install_jsite.cmd trunk/apps/new_installer/res/windows/bin/install_plugins.cmd trunk/apps/new_installer/res/windows/bin/install_service.bat trunk/apps/new_installer/res/windows/bin/install_thaw.cmd trunk/apps/new_installer/res/windows/bin/install_updater.cmd trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd trunk/apps/new_installer/res/windows/bin/remove_service.bat trunk/apps/new_installer/res/windows/bin/setup.cmd trunk/apps/new_installer/res/windows/bin/start.cmd trunk/apps/new_installer/res/windows/bin/stop.cmd Log: new_installer: improve the windows part of the installer (both wording and the uninstaller) Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -4,6 +4,6 @@ @cd /D %INSTALL_PATH% @if exist offline goto end - at echo "Downloading freenet-ext.jar" + at echo Downloading freenet-ext.jar @java -jar bin\sha1test.jar freenet-ext.jar . > NUL :end Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -4,7 +4,7 @@ @cd /D %INSTALL_PATH% @if exist offline goto end - at echo "Downloading freenet-stable-latest.jar" + at echo Downloading freenet-stable-latest.jar @java -jar bin\sha1test.jar freenet-stable-latest.jar . > NUL :end @copy freenet-stable-latest.jar freenet.jar > NUl Modified: trunk/apps/new_installer/res/windows/bin/install_frost.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -6,10 +6,10 @@ @if not exist frost goto nofrost @del /F frost > NUL @if exist offline goto end - at echo "Downloading Frost" + at echo Downloading Frost @java -jar bin\sha1test.jar frost/frost.zip . > NUL :end - at echo "Setting Frost up" + at echo Setting Frost up @mkdir frost @java -jar bin\uncompress.jar frost.zip frost > NUL :nofrost Modified: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -6,7 +6,7 @@ @if not exist jsite goto nojsite @del /F jsite > NUL @if exist offline goto end - at echo "Downloading jSite" + at echo Downloading jSite @mkdir jSite @java -jar bin\sha1test.jar jSite/jSite.jar > NUL @move jSite.jar jSite > NUL Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -3,7 +3,7 @@ @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% - at echo "Setting up plugins" + at echo Setting up plugins @mkdir plugins 2> NUL @set PLUGINS= Modified: trunk/apps/new_installer/res/windows/bin/install_service.bat =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_service.bat 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_service.bat 2007-06-17 20:08:49 UTC (rev 13637) @@ -1,7 +1,6 @@ @set PATH=%SYSTEMROOT%\System32\;%PATH% - at echo "Cleaning up" - at net stop freenet-darknet + at echo Cleaning up @wrapper-windows-x86-32.exe -r ../wrapper.conf - at echo "Registering Freenet as a system service" + at echo Registering Freenet as a system service @wrapper-windows-x86-32.exe -i ../wrapper.conf Modified: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -5,7 +5,7 @@ @if not exist thaw goto nothaw @del /F thaw > NUL - at echo "Downloading Thaw" + at echo Downloading Thaw @if exist offline goto end @mkdir Thaw @java -jar bin\sha1test.jar Thaw/Thaw.jar > NUL Modified: trunk/apps/new_installer/res/windows/bin/install_updater.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_updater.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_updater.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -3,7 +3,7 @@ @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% - at echo "Downloading update.cmd" + at echo Downloading update.cmd @if exist offline goto end @java -jar bin\sha1test.jar update/update.cmd . > NUL :end Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -3,7 +3,7 @@ @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% - at echo "Detecting tcp port availability" + at echo Detecting tcp port availability :: Try to detect a free, available port for fproxy @set FPROXY_PORT=8888 @java -jar bin\bindtest.jar %FPROXY_PORT% @@ -48,7 +48,7 @@ @bin\cat bin\stop.cmd | bin\sed.exe "s/darknet/darknet-%FPROXY_PORT%/g" > stop.cmd @move /Y stop.cmd bin\stop.cmd - at echo "Installing the wrapper" + at echo Installing the wrapper @echo - Creating a user for freenet :: A ugly hack to workaround password policy enforcements @set TMPPASSWORD=%random%%random% @@ -59,14 +59,14 @@ :: create the user @net user freenet %PASSWORD% /add /comment:"this user is used by freenet: do NOT delete it!" /expires:never /passwordchg:no /fullname:"Freenet dedicated user" > NUL @if errorlevel 0 goto pwgen - at echo "Error while creating the freenet user! let's try something else..." + at echo Error while creating the freenet user! let's try something else... :: try with a stronger password @set TMPPASSWORD=Freenet_0@%PASSWORD%- @set PASSWORD=%TMPPASSWORD:~0,12% @net user freenet %PASSWORD% /add /comment:"this user is used by freenet: do NOT delete it!" /expires:never /passwordchg:no /fullname:"Freenet dedicated user" @if errorlevel 0 goto pwgen :: We shouldn't reach that point - at echo "The workaround is still not working! will install freenet to run as SYSTEM" + at echo The workaround is still not working! will install freenet to run as SYSTEM @goto registerS :pwgen @@ -102,6 +102,5 @@ @echo - Start the node up @net start freenet-darknet-%FPROXY_PORT% - at echo "Spawning up a browser" - at start http://127.0.0.1:%FPROXY_PORT%/ + at echo Spawning up a browser @start welcome.html Modified: trunk/apps/new_installer/res/windows/bin/remove_service.bat =================================================================== --- trunk/apps/new_installer/res/windows/bin/remove_service.bat 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/remove_service.bat 2007-06-17 20:08:49 UTC (rev 13637) @@ -1,7 +1,6 @@ @set PATH=%SYSTEMROOT%\System32\;%PATH% - at echo "Cleaning up" + at echo Cleaning up @net stop freenet-darknet - at echo "Unregistering Freenet as a system service" + at echo Unregistering Freenet as a system service @wrapper-windows-x86-32.exe -r ../wrapper.conf - at pause Modified: trunk/apps/new_installer/res/windows/bin/setup.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/setup.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/setup.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -9,7 +9,7 @@ @del /F freenet.ini > NUL :nocleanup - at echo "Registering .fref file extension" + at echo Registering .fref file extension @echo Windows Registry Editor Version 5.00 >> fref.reg @echo [HKEY_CLASSES_ROOT\.fref] >> fref.reg @echo @="fref_auto_file" >> fref.reg Modified: trunk/apps/new_installer/res/windows/bin/start.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/start.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/start.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -1,4 +1,4 @@ - at echo "Starting Freenet" + at echo Starting Freenet @set PATH=%SYSTEMROOT%\System32\;%PATH% @net start freenet-darknet @pause Modified: trunk/apps/new_installer/res/windows/bin/stop.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/stop.cmd 2007-06-17 18:51:21 UTC (rev 13636) +++ trunk/apps/new_installer/res/windows/bin/stop.cmd 2007-06-17 20:08:49 UTC (rev 13637) @@ -1,4 +1,4 @@ - at echo "Stopping Freenet" + at echo Stopping Freenet @set PATH=%SYSTEMROOT%\System32\;%PATH% @net stop freenet-darknet @pause
