|
@@ -69,14 +69,14 @@ |
|
|
block discarded – undo |
|
69
|
69
|
File "GEANTLink64.msi"
|
|
70
|
70
|
nsArray::Set Delete_files "GEANTLink64.msi"
|
|
71
|
71
|
DetailPrint "Install GEANTLink installer"
|
|
72
|
|
- MessageBox MB_OK "<?php echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
|
|
|
72
|
+ MessageBox MB_OK "<?php echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
|
|
73
|
73
|
!insertmacro debug_cat 1 "Run GEANTLink installer"
|
|
74
|
74
|
!insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi"'
|
|
75
|
75
|
ClearErrors
|
|
76
|
76
|
ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink$Platform.msi" /qb' $0
|
|
77
|
77
|
!insertmacro debug_cat 4 "GEANTLink returned $0"
|
|
78
|
78
|
StrCmp $0 0 Cont2
|
|
79
|
|
- MessageBox MB_OK "<?php echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
|
|
|
79
|
+ MessageBox MB_OK "<?php echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
|
|
80
|
80
|
Quit
|
|
81
|
81
|
Cont2:
|
|
82
|
82
|
FunctionEnd
|
Please login to merge, or discard this patch.