Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit aee1a10

Browse files
committed
parse csv's in initializesetup for proper error handling
1 parent 53ea5a9 commit aee1a10

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

ElixirWeb.iss

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,6 @@ begin
184184
True, True // (Use Radio Buttons), (Put them in a scrollable list box)
185185
);
186186
187-
// Create an array of TElixirRelease records from elixir.csv and store them in a global variable
188-
GlobalElixirReleases := CSVToElixirReleases(GlobalElixirCSVFilePath);
189-
190-
// Check if above didn't work
191-
if GetArrayLength(GlobalElixirReleases) = 0 then begin
192-
MsgBox('Error: Parsing {#ELIXIR_CSV_URL} failed. Setup cannot continue.', mbInformation, MB_OK);
193-
Abort();
194-
end;
195-
196187
// Use the global Elixir release array to populate the custom Elixir release list box
197188
ElixirReleasesToListBox(GlobalElixirReleases, GlobalPageSelRelease.CheckListBox);
198189
@@ -203,20 +194,12 @@ begin
203194
'', 0, True, True, Ref
204195
);
205196
end;
197+
206198
// Create a selection which will allow the custom Elixir release page to show up next
207199
GlobalPageSelInstallType.CheckListBox.AddRadioButton(
208200
'Select another release to install',
209201
'', 0, False, True, nil
210202
);
211-
212-
// Create an TErlangData from erlang.csv record and store it in a global variable
213-
GlobalErlangData := CSVToErlangData(GlobalErlangCSVFilePath);
214-
215-
// Check if above didn't work
216-
if GlobalErlangData.OTPVersion = '' then begin
217-
MsgBox('Error: Parsing {#ERLANG_CSV_URL} failed. Setup cannot continue.', mbInformation, MB_OK);
218-
Abort();
219-
end;
220203
end;
221204
222205
function InitializeSetup(): Boolean;
@@ -239,6 +222,26 @@ begin
239222
Result := False;
240223
exit;
241224
end;
225+
226+
// Create an array of TElixirRelease records from elixir.csv and store them in a global variable
227+
GlobalElixirReleases := CSVToElixirReleases(GlobalElixirCSVFilePath);
228+
229+
// Check if above didn't work
230+
if GetArrayLength(GlobalElixirReleases) = 0 then begin
231+
MsgBox('Error: Parsing {#ELIXIR_CSV_URL} failed. Setup cannot continue.', mbInformation, MB_OK);
232+
Result := False;
233+
exit;
234+
end;
235+
236+
// Create an TErlangData from erlang.csv record and store it in a global variable
237+
GlobalErlangData := CSVToErlangData(GlobalErlangCSVFilePath);
238+
239+
// Check if above didn't work
240+
if GlobalErlangData.OTPVersion = '' then begin
241+
MsgBox('Error: Parsing {#ERLANG_CSV_URL} failed. Setup cannot continue.', mbInformation, MB_OK);
242+
Result := False;
243+
exit;
244+
end;
242245
end;
243246
244247
function CheckToInstallErlang: Boolean; begin

0 commit comments

Comments
 (0)