fix dictionary downloading

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19210 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2007-07-25 18:42:22 +00:00
parent f46f686d0d
commit 09e05ccf85
3 changed files with 6 additions and 5 deletions

View File

@ -106,7 +106,7 @@ Function DownloadDictionary
dict_download:
!insertmacro DownloadFile $R3 ASPELLDICTS aspell6-$R0.exe
!insertmacro DownloadFile $R3 ASPELLDICTS aspell6-$R0.exe /aspell6-$R0.exe
${if} $R3 != "OK"
#Download failed

View File

@ -73,7 +73,7 @@ External Components: MiKTeX, ImageMagick, Ghostscript
download_${COMPONENT}:
!insertmacro DownloadFile $R0 "${COMPONENT}" "${COMPONENT}Setup.exe"
!insertmacro DownloadFile $R0 "${COMPONENT}" "${COMPONENT}Setup.exe" ""
${if} $R0 != "OK"
#Download failed

View File

@ -4,21 +4,22 @@ Support code for file downloads
*/
!macro DownloadFile RET ID FILENAME
!macro DownloadFile RET ID FILENAME APPEND
#Downloads a file using the InetLoad plug-in (HTTP or FTP)
#RET = Return value (OK if succesful)
#ID = Name of the download in settings.nsh
#FILENAME = Location to store file
#APPEND = Filename to append to server location in settings.nsh
#Try first mirror server
InetLoad::load "${DOWNLOAD_${ID}}" "$PLUGINSDIR\${FILENAME}" /END
InetLoad::load "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END
Pop ${RET} #Return value (OK if succesful)
${if} ${RET} != "OK"
#Download failed, try second mirror server
InetLoad::load "${DOWNLOADALT_${ID}}" "$PLUGINSDIR\${FILENAME}" /END
InetLoad::load "${DOWNLOADALT_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END
Pop ${RET}
${endif}