Author: nextgens Date: 2006-08-18 19:26:28 +0000 (Fri, 18 Aug 2006) New Revision: 10202
Modified: trunk/apps/installer/installclasspath/windows/update.cmd Log: add the same parameter to the win32 script : it NEEDs TESTING Modified: trunk/apps/installer/installclasspath/windows/update.cmd =================================================================== --- trunk/apps/installer/installclasspath/windows/update.cmd 2006-08-18 19:17:32 UTC (rev 10201) +++ trunk/apps/installer/installclasspath/windows/update.cmd 2006-08-18 19:26:28 UTC (rev 10202) @@ -2,7 +2,7 @@ ::This script is designed for the Windows command line shell, so please don't put it into anything else! :) ::If you want to debug this script by adding pauses and stuff, please do it from another batch file, because ::if you modify this script in any way it will be detected as outdated and will be overwritten on the next run. -::To force a re-download of the latest Freenet.jar, simply delete freenet-stable-latest.jar.url before running this script. +::To force a re-download of the latest Freenet.jar, simply delete freenet-%RELEASE%-latest.jar.url before running this script. echo ----- echo - Freenet Windows update script 1.6 by Zero3Cool (zero3cool at zerosplayground.dk) echo - Freenet Windows update script 1.8 by Juiceman (juiceman69 at gmail.com) @@ -22,6 +22,8 @@ set MAGICSTRING=INDO set RESTART=0 set PATH=%SYSTEMROOT%\System32\;%PATH% +set RELEASE=stable +if "%1"=="testing" set RELEASE=testing ::Go to our location for %%I in (%0) do set LOCATION=%%~dpI @@ -71,17 +73,17 @@ echo - Updater is up to date. echo ----- echo - Checking for Freenet updates... -if exist freenet-stable-latest.jar.new.url del freenet-stable-latest.jar.new.url -bin\wget.exe -o NUL --timeout=10 --waitretry=20 http://downloads.freenetproject.org/alpha/freenet-stable-latest.jar.url -O freenet-stable-latest.jar.new.url +if exist freenet-%RELEASE%-latest.jar.new.url del freenet-%RELEASE%-latest.jar.new.url +bin\wget.exe -o NUL --timeout=10 --waitretry=20 http://downloads.freenetproject.org/alpha/freenet-%RELEASE%-latest.jar.url -O freenet-%RELEASE%-latest.jar.new.url -if not exist freenet-stable-latest.jar.new.url goto error3 -FOR %%I IN ("%LOCATION%freenet-stable-latest.jar.url") DO if %%~zI==0 goto error3 +if not exist freenet-%RELEASE%-latest.jar.new.url goto error3 +FOR %%I IN ("%LOCATION%freenet-%RELEASE%-latest.jar.url") DO if %%~zI==0 goto error3 ::Do we have something old to compare with? If not, update right away -if not exist freenet-stable-latest.jar.url goto update1 +if not exist freenet-%RELEASE%-latest.jar.url goto update1 ::Compare with current copy -fc freenet-stable-latest.jar.url freenet-stable-latest.jar.new.url > NUL +fc freenet-%RELEASE%-latest.jar.url freenet-%RELEASE%-latest.jar.new.url > NUL if not errorlevel 1 goto noupdate ::New version found, check if the node is currently running @@ -102,17 +104,17 @@ :update2 echo ----- echo - Downloading new version and updating local installation... -if exist freenet-stable-latest.jar.bak del freenet-stable-latest.jar.bak -if exist freenet-stable-latest.jar ren freenet-stable-latest.jar freenet-stable-latest.jar.bak -bin\wget.exe -o NUL --timeout=10 --waitretry=20 -i freenet-stable-latest.jar.new.url -O freenet-stable-latest.jar -copy freenet-stable-latest.jar freenet.jar +if exist freenet-%RELEASE%-latest.jar.bak del freenet-%RELEASE%-latest.jar.bak +if exist freenet-%RELEASE%-latest.jar ren freenet-%RELEASE%-latest.jar freenet-%RELEASE%-latest.jar.bak +bin\wget.exe -o NUL --timeout=10 --waitretry=20 -i freenet-%RELEASE%-latest.jar.new.url -O freenet-%RELEASE%-latest.jar +copy freenet-%RELEASE%-latest.jar freenet.jar -if not exist freenet-stable-latest.jar goto error4 -FOR %%I IN ("%LOCATION%freenet-stable-latest.jar") DO if %%~zI==0 goto error4 -java -cp lib\sha1test.jar Sha1Test freenet-stable-latest.jar +if not exist freenet-%RELEASE%-latest.jar goto error4 +FOR %%I IN ("%LOCATION%freenet-%RELEASE%-latest.jar") DO if %%~zI==0 goto error4 +java -cp lib\sha1test.jar Sha1Test freenet-%RELEASE%-latest.jar if not errorlevel 0 goto error4 -if exist freenet-stable-latest.jar.url del freenet-stable-latest.jar.url -ren freenet-stable-latest.jar.new.url freenet-stable-latest.jar.url +if exist freenet-%RELEASE%-latest.jar.url del freenet-%RELEASE%-latest.jar.url +ren freenet-%RELEASE%-latest.jar.new.url freenet-%RELEASE%-latest.jar.url echo - Freenet-cvs-snapshot.jar verified and updated. goto end @@ -136,9 +138,9 @@ :error4 echo - Error! Freenet update failed, trying to restore backup... -if exist freenet-stable-latest.jar del freenet-stable-latest.jar -if exist freenet-stable-latest.jar.bak ren freenet-stable-latest.jar.bak freenet-stable-latest.jar -if exist freenet-stable-latest.jar.url del freenet-stable-latest.jar.url +if exist freenet-%RELEASE%-latest.jar del freenet-%RELEASE%-latest.jar +if exist freenet-%RELEASE%-latest.jar.bak ren freenet-%RELEASE%-latest.jar.bak freenet-%RELEASE%-latest.jar +if exist freenet-%RELEASE%-latest.jar.url del freenet-%RELEASE%-latest.jar.url goto end :error5 @@ -152,8 +154,8 @@ :end echo ----- echo - Cleaning up... -if exist freenet-stable-latest.jar.new.url del freenet-stable-latest.jar.new.url -if exist freenet-stable-latest.jar.bak del freenet-stable-latest.jar.bak +if exist freenet-%RELEASE%-latest.jar.new.url del freenet-%RELEASE%-latest.jar.new.url +if exist freenet-%RELEASE%-latest.jar.bak del freenet-%RELEASE%-latest.jar.bak if %RESTART%==0 goto cleanup2 echo - Restarting Freenet...
