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

Commit 8af076e

Browse files
committed
Prefer Erlang path of specified version
1 parent def7475 commit 8af076e

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

ElixirWeb.iss

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#define OTP_64_URL 'http://www.erlang.org/download/otp_win64_17.1.exe'
2727
#define OTP_64_EXE 'otp_win64_17.1.exe'
2828

29+
#define OTP_ERTS_VERSION '6.1'
30+
2931
#include <idp.iss>
3032

3133
[Setup]
@@ -216,14 +218,20 @@ begin
216218
Result := '';
217219
218220
if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\Ericsson\Erlang', Versions) then begin
219-
RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Ericsson\Erlang\' + Versions[GetArrayLength(Versions) - 1], '', Path);
220-
Result := Path;
221+
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Ericsson\Erlang\' + '{#OTP_ERTS_VERSION}', '', Path) then begin
222+
Result := Path;
223+
end else if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Ericsson\Erlang\' + Versions[GetArrayLength(Versions) - 1], '', Path) then begin
224+
Result := Path;
225+
end;
221226
end;
222227
223228
if IsWin64 then begin
224229
if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\Wow6432Node\Ericsson\Erlang', Versions) then begin
225-
RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Wow6432Node\Ericsson\Erlang\' + Versions[GetArrayLength(Versions) - 1], '', Path);
226-
Result := Path;
230+
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Wow6432Node\Ericsson\Erlang\' + '{#OTP_ERTS_VERSION}', '', Path) then begin
231+
Result := Path;
232+
end else if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Wow6432Node\Ericsson\Erlang\' + Versions[GetArrayLength(Versions) - 1], '', Path) then begin
233+
Result := Path;
234+
end;
227235
end;
228236
end;
229237
end;

0 commit comments

Comments
 (0)