fix dictionary downloading

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19210 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/components/dicts.nsh b/development/Win32/packaging/installer/components/dicts.nsh
index db7f93d9d8a2924a7ff24a662b4fda78f736469b..95dfb9d66e97e56060618328eef322c5864a593b 100644 (file)
--- a/development/Win32/packaging/installer/components/dicts.nsh
+++ b/development/Win32/packaging/installer/components/dicts.nsh
@@ -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

diff --git a/development/Win32/packaging/installer/components/external.nsh b/development/Win32/packaging/installer/components/external.nsh
index 2c33850faafcc0abf1bc4b043ff7a3c127a66702..0ac4109ddf680860e27b80d84deaaeee4c8991dd 100644 (file)
--- a/development/Win32/packaging/installer/components/external.nsh
+++ b/development/Win32/packaging/installer/components/external.nsh
@@ -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

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