Don't these URL's need ".nyud.net:8090" added after them to take advantage of Coral Cache? Or do you have some sort of server-side redirect enabled?
On 11/28/05, bob at freenetproject.org <bob at freenetproject.org> wrote: > Author: bob > Date: 2005-11-29 00:36:32 +0000 (Tue, 29 Nov 2005) > New Revision: 7630 > > Modified: > trunk/contrib/wininstall/freenet-modern.nsi > trunk/contrib/wininstall/update/Update.nsi > Log: > Updates for new emu/coralcache file locations. > > Modified: trunk/contrib/wininstall/freenet-modern.nsi > =================================================================== > --- trunk/contrib/wininstall/freenet-modern.nsi 2005-11-26 21:24:03 UTC (rev > 7629) > +++ trunk/contrib/wininstall/freenet-modern.nsi 2005-11-29 00:36:32 UTC (rev > 7630) > @@ -347,7 +347,7 @@ > # if "Don't Prompt Me" is selected the following message box will not > appear and seed download will be automatic > # ###TODO > MessageBox MB_YESNO "To connect to the Freenet network, your Freenet node > needs to know about at least one other Freenet node.$\r$\nThis is called a > 'Node Reference' or 'seednodes.ref' file.$\r$\nDo you want to download a > compressed 'seednodes.ref' from the Free Net Project's servers?$\r$\nYou may > want to say NO if you have been given a .ref file by a friend,$\r$\nor if you > have installed Freenet before and still have the file named seednodes.ref" > IDNO NoDownloadSeedNodes > - Push "http://freenetproject.org/snapshots/seednodes.zip"; > + Push "http://downloads.freenetproject.org/seednodes/seednodes.ref.zip"; > Push "$R0\freenet-install" > Push "seednodes.zip" > Call RetryableDownload > @@ -365,28 +365,28 @@ > StrCmp "$3" "${NUMBER_OF_DOWNLOADABLE_FILES}" DoneGettingFiles > > ; Push ".\Freenet\tools\NodeConfig.exe" > - Push "http://freenetproject.org/snapshots/NodeConfig.exe"; > + Push "http://downloads.freenetproject.org/NodeConfig.exe"; > Push "$R0\freenet-install" > Push "NodeConfig.exe" > Call GetFile > IfErrors DiskWriteError > > ; Push ".\Freenet\tools\freenet.exe" > - Push "http://freenetproject.org/snapshots/freenet.exe"; > + Push "http://downloads.freenetproject.org/freenet.exe"; > Push "$R0\freenet-install" > Push "freenet.exe" > Call GetFile > IfErrors DiskWriteError > > ; Push ".\Freenet\jar\freenet-ext.jar" > - Push "http://freenetproject.org/snapshots/freenet-ext.jar"; > + Push "http://downloads.freenetproject.org/freenet-ext.jar"; > Push "$R0\freenet-install" > Push "freenet-ext.jar" > Call GetFile > IfErrors DiskWriteError > > ; Push ".\Freenet\jar\freenet.jar" > - Push "http://freenetproject.org/snapshots/freenet-latest.jar"; > + Push "http://downloads.freenetproject.org/freenet-stable-latest.jar"; > Push "$R0\freenet-install" > Push "freenet.jar" > Call GetFile > @@ -430,7 +430,7 @@ > goto seednodesUnzipped > > unzipSeednodesDownloadError: > -MessageBox MB_OK "Sorry, the compressed seednodes 'seednodes.zip' could not > be found.$\r$\nA seednodes file is needed for freenet to work.$\r$\nYou could > try downloading seednodes manually from :$\r$\n > http://freenetproject.org/snapshots/"; > +MessageBox MB_OK "Sorry, the compressed seednodes 'seednodes.zip' could not > be found.$\r$\nA seednodes file is needed for freenet to work.$\r$\nYou could > try downloading seednodes manually from :$\r$\n > http://downloads.freenetproject.org/seednodes/"; > > seednodesUnzipped: > > @@ -615,6 +615,18 @@ > Delete "$INSTDIR\lsnodes*" > Delete "$INSTDIR\rtnodes*" > Delete "$INSTDIR\rtprops*" > + > + # Bob H : A load of generated node files weren't being deleted > + # This still leaves the .freenet\ directory hierarchy .. what should we do > with this? > + # Personally I'm somewhat inclined to just nuke $INSTDIR and be done with > it :) > + Delete "$INSTDIR\lock.lck" > + Delete "$INSTDIR\.freenet" > + Delete "$INSTDIR\ratedata_a" > + Delete "$INSTDIR\ngrt_global_a" > + Delete "$INSTDIR\ngrt_global_b" > + Delete "$INSTDIR\ratedata_b" > + Delete "$INSTDIR\node" > + > DeleteRegValue HKLM "Software\${PRODUCT_NAME}" "Start Menu Folder" > DeleteRegValue HKLM "Software\${PRODUCT_NAME}" "instpath" > > > Modified: trunk/contrib/wininstall/update/Update.nsi > =================================================================== > --- trunk/contrib/wininstall/update/Update.nsi 2005-11-26 21:24:03 UTC (rev > 7629) > +++ trunk/contrib/wininstall/update/Update.nsi 2005-11-29 00:36:32 UTC (rev > 7630) > @@ -6,6 +6,7 @@ > ; > > # Bob H, Nov 2005 : Made it grab and decompress zipped seednodes instead of > raw ones. > +# Bob H, later : New emu / coralcache file locations, UPX path fix > > !include ..\webinstall.inc > !include "MUI.nsh" > @@ -25,7 +26,7 @@ > ;AutoCloseWindow true > ShowInstDetails show > > -!packhdr temp.dat "..\upx.exe -9 temp.dat" > +!packhdr temp.dat "upx.exe -9 temp.dat" > > ;-------------------------------- > ;Modern UI Configuration > @@ -77,14 +78,14 @@ > Goto CloseFreenet > > ClosedFreenet: > - StrCpy $1 "http://freenetproject.org/snapshots/freenet.jar"; > + StrCpy $1 "http://downloads.freenetproject.org/freenet-stable-latest.jar"; > StrCpy $2 "$INSTDIR\freenet.jar.new" > Call DownloadFile > > Delete "$INSTDIR\freenet.jar" > Rename "$INSTDIR\freenet.jar.new" "$INSTDIR\freenet.jar" > > - StrCpy $1 "http://freenetproject.org/snapshots/seednodes.zip"; > + StrCpy $1 "http://downloads.freenetproject.org/seednodes/seednodes.ref.zip"; > StrCpy $2 "$INSTDIR\seednodes.zip" > Call DownloadFile > > @@ -92,8 +93,8 @@ > # Rename "$INSTDIR\seednodes.ref.new" "$INSTDIR\seednodes.ref" > > # Bob H : Unzip seednodes (to seednodes.ref) > +# Note that our local copy will still be seednodes.zip because download > chooses name > ZipDLL::extractall "$INSTDIR\seednodes.zip" "$INSTDIR" > - > > # update finished, starting the node if it ran before > IntCmp $9 1 0 StartedFreenet > @@ -112,6 +113,6 @@ > Function .onInstFailed > RMDir /r $TEMP\freenet > Delete "$INSTDIR\freenet.jar.new" > - Delete "$INSTDIR\seednodes.ref.new" > + Delete "$INSTDIR\seednodes.ref.zip" > FunctionEnd > > > _______________________________________________ > cvs mailing list > cvs at freenetproject.org > http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs > -- I may disagree with what you have to say, but I shall defend, to the death, your right to say it. - Voltaire
