|
|
|
|
110
|
// us permission to delete the file (UAC), otherwise we can just go ahead
|
110
|
// us permission to delete the file (UAC), otherwise we can just go ahead
|
111
|
// and run the updater.
|
111
|
// and run the updater.
|
112
|
if not DeleteFile(pchar(jarName)) then begin
|
112
|
if not DeleteFile(pchar(jarName)) then begin
|
113
|
- errorMessage := 'An update to DMDirc has been previously downloaded.';
|
|
|
|
|
113
|
+ errorMessage := 'An update to DMDirc has been previously downloaded. ';
|
114
|
errorMessage := errorMessage+#13#10;
|
114
|
errorMessage := errorMessage+#13#10;
|
115
|
- errorMessage := errorMessage+#13#10+'As you are running Windows Vista, DMDirc requires administer access to';
|
|
|
116
|
- errorMessage := errorMessage+#13#10+'complete the update.';
|
|
|
|
|
115
|
+ errorMessage := errorMessage+#13#10+'As you are running Windows Vista, DMDirc requires administrator access to ';
|
|
|
116
|
+ errorMessage := errorMessage+#13#10+'complete the update. ';
|
117
|
errorMessage := errorMessage+#13#10;
|
117
|
errorMessage := errorMessage+#13#10;
|
118
|
- errorMessage := errorMessage+#13#10+'Please click ''Allow'' on the UAC prompt to complete the update, or click no';
|
|
|
119
|
- errorMessage := errorMessage+#13#10+'here to continue without updating.';
|
|
|
|
|
118
|
+ errorMessage := errorMessage+#13#10+'Please click ''Allow'' on the UAC prompt to complete the update, or click no ';
|
|
|
119
|
+ errorMessage := errorMessage+#13#10+'here to continue without updating. ';
|
120
|
if askQuestion(errorMessage) then begin
|
120
|
if askQuestion(errorMessage) then begin
|
121
|
RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
|
121
|
RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
|
122
|
end;
|
122
|
end;
|
|
|
|
|
131
|
if (ExecAndWait(javaCommand+' -version') <> 0) then begin
|
131
|
if (ExecAndWait(javaCommand+' -version') <> 0) then begin
|
132
|
errorMessage := 'No JVM is currently installed.';
|
132
|
errorMessage := 'No JVM is currently installed.';
|
133
|
errorMessage := errorMessage+#13#10;
|
133
|
errorMessage := errorMessage+#13#10;
|
134
|
- errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
|
|
|
135
|
- errorMessage := errorMessage+#13#10+'http://java.com/';
|
|
|
|
|
134
|
+ errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from: ';
|
|
|
135
|
+ errorMessage := errorMessage+#13#10+'http://java.com/ ';
|
136
|
errorMessage := errorMessage+#13#10;
|
136
|
errorMessage := errorMessage+#13#10;
|
137
|
- errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
|
|
|
|
|
137
|
+ errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance, ';
|
138
|
errorMessage := errorMessage+#13#10+'please feel free to contact us.';
|
138
|
errorMessage := errorMessage+#13#10+'please feel free to contact us.';
|
139
|
|
139
|
|
140
|
showError(errorMessage);
|
140
|
showError(errorMessage);
|
|
|
|
|
146
|
if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
|
146
|
if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
|
147
|
errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
|
147
|
errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
|
148
|
errorMessage := errorMessage+#13#10;
|
148
|
errorMessage := errorMessage+#13#10;
|
149
|
- errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
|
|
|
150
|
- errorMessage := errorMessage+#13#10+'http://java.com/';
|
|
|
|
|
149
|
+ errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from: ';
|
|
|
150
|
+ errorMessage := errorMessage+#13#10+'http://java.com/ ';
|
151
|
errorMessage := errorMessage+#13#10;
|
151
|
errorMessage := errorMessage+#13#10;
|
152
|
- errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
|
|
|
153
|
- errorMessage := errorMessage+#13#10+'please feel free to contact us.';
|
|
|
|
|
152
|
+ errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance, ';
|
|
|
153
|
+ errorMessage := errorMessage+#13#10+'please feel free to contact us. ';
|
154
|
|
154
|
|
155
|
showError(errorMessage);
|
155
|
showError(errorMessage);
|
156
|
end
|
156
|
end
|