/[ascend]/trunk/nsis/download.nsi
ViewVC logotype

Diff of /trunk/nsis/download.nsi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2606 by jpye, Tue Apr 24 06:14:23 2012 UTC revision 2607 by jpye, Tue Apr 24 23:16:19 2012 UTC
# Line 20  Var DAI_REMOVE Line 20  Var DAI_REMOVE
20            
21      ${If} $DAI_RET != "success"      ${If} $DAI_RET != "success"
22          DetailPrint "Downloading file ${DAI_FN}..."          DetailPrint "Downloading file ${DAI_FN}..."
23            DetailPrint "URL: ${DAI_URL}"
24          StrCpy $DAI_TMPFILE "$TEMP\${DAI_FN}"          StrCpy $DAI_TMPFILE "$TEMP\${DAI_FN}"
25          nsisdl::download /TIMEOUT=30000 "${DAI_URL}" "$DAI_TMPFILE"  
26          Pop $DAI_RET ;Get the return value                ; Download files using the INETC plugin for NSIS, available from
27            ; http://nsis.sourceforge.net/Inetc_plug-in
28            inetc::get /CAPTION "${DAI_FN}""${DAI_URL}" "$DAI_TMPFILE" /END
29            Pop $DAI_RET ; return value = exit code, "OK" means OK
30                            
31          ${DoWhile} $DAI_RET != "success"          ${DoWhile} $DAI_RET != "OK"
32              ${If} $DAI_RET == "cancel"              ${If} $DAI_RET == "cancel"
33                  StrCpy $DAI_MSG "cancelled"                  StrCpy $DAI_MSG "cancelled"
34              ${Else}              ${Else}
# Line 32  Var DAI_REMOVE Line 36  Var DAI_REMOVE
36              ${EndIf}              ${EndIf}
37                            
38              DetailPrint "Download of ${DAI_FN} $DAI_MSG."              DetailPrint "Download of ${DAI_FN} $DAI_MSG."
39              ${IfNot} ${Cmd} `MessageBox MB_ICONEXCLAMATION|MB_YESNO "${DAI_NAME} download $DAI_MSG.$\n$\nDo you wish to re-attempt the download?" IDYES `              ${IfNot} ${Cmd} `MessageBox MB_ICONEXCLAMATION|MB_YESNO "${DAI_NAME} download $DAI_MSG. URL was:$\n$\n${DAI_URL}$\n$\nDo you wish to re-attempt the download?" IDYES `
40                  ; response was no                  ; response was no
41                  ;MessageBox MB_OK "File ${DAI_NAME} will not be installed..."                  ;MessageBox MB_OK "File ${DAI_NAME} will not be installed..."
42                  Pop $1                  Pop $1

Legend:
Removed from v.2606  
changed lines
  Added in v.2607

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22