@@ -58,8 +58,9 @@ Source: "compiler:Setup.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
58
58
Source : " compiler:SetupLdr.e32" ; DestDir : " {tmp} " ; Flags : deleteafterinstall
59
59
60
60
[Run]
61
- Filename : " {tmp} \{code:ConstGetErlangExe32}" ; Flags : hidewizard ; StatusMsg : " Installing {code:ConstGetErlangName32}..." ; Tasks: erlang\32 ; AfterInstall : AppendNewErlangPathIfTaskSelected(False)
62
- Filename : " {tmp} \{code:ConstGetErlangExe64}" ; Flags : hidewizard ; StatusMsg : " Installing {code:ConstGetErlangName64}..." ; Tasks: erlang\64 ; AfterInstall : AppendNewErlangPathIfTaskSelected(True)
61
+ Filename : " {tmp} \{code:ConstGetErlangExe32}" ; Flags : hidewizard ; StatusMsg : " Installing {code:ConstGetErlangName32}..." ; Tasks: erlang\32
62
+ Filename : " {tmp} \{code:ConstGetErlangExe64}" ; Flags : hidewizard ; StatusMsg : " Installing {code:ConstGetErlangName64}..." ; Tasks: erlang\64
63
+ Filename : " cmd" ; Parameters : " /C true" ; Flags : runhidden ; StatusMsg : " Appending {code:ConstGetLatestErlangPath}\bin to Path environment variable..." ; Tasks: erlang\newpath existingpath; BeforeInstall : AppendLatestErlangPath
63
64
Filename : " {tmp} \7za.exe" ; Parameters : " x -oelixir Precompiled.zip" ; WorkingDir : " {tmp} " ; StatusMsg : " Extracting Precompiled.zip archive..."
64
65
Filename : " {tmp} \ISCC.exe" ; Parameters : " /dElixirVersion={code:ConstGetSelectedReleaseVersion} /dSkipWelcome /dNoCompression Elixir.iss" ; WorkingDir : " {tmp} " ; StatusMsg : " Compiling Elixir installer..."
65
66
Filename : " {tmp} \Output\elixir-v{code:ConstGetSelectedReleaseVersion}-setup.exe" ; Flags : nowait ; StatusMsg : " Starting Elixir installer..."
@@ -69,7 +70,7 @@ Name: "erlang"; Description: "Install Erlang"; Check: CheckToInstallErlang
69
70
Name : " erlang\32" ; Description : " {code:ConstGetErlangName32}" ; Flags : exclusive
70
71
Name : " erlang\64" ; Description : " {code:ConstGetErlangName64}" ; Flags : exclusive ; Check : IsWin64
71
72
Name : " erlang\newpath" ; Description : " Append Erlang directory to Path environment variable"
72
- Name : " existingpath" ; Description : " Append {code:ConstGetExistingErlangPath }\bin to Path environment variable" ; Check : CheckToAddExistingErlangPath
73
+ Name : " existingpath" ; Description : " Append {code:ConstGetLatestErlangPath }\bin to Path environment variable" ; Check : CheckToAddExistingErlangPath
73
74
74
75
[Code]
75
76
#include " src\u til.iss"
91
92
92
93
CacheSelectedRelease: TElixirRelease;
93
94
94
- procedure AppendNewErlangPathIfTaskSelected (Of64Bit: Boolean) ;
95
+ procedure AppendLatestErlangPath ;
95
96
begin
96
- if IsTaskSelected(' erlang\newpath' ) then
97
- AppendPath(GetLatestErlangPathOfArch(Of64Bit) + ' \bin' );
97
+ AppendPath(GetLatestErlangPath + ' \bin' );
98
98
end ;
99
99
100
100
procedure CurPageChanged (CurPageID: Integer);
@@ -194,7 +194,7 @@ function ConstGetErlangExe32(Param: String): String; begin
194
194
Result := GlobalErlangData.Exe32; end ;
195
195
function ConstGetErlangExe64 (Param: String): String; begin
196
196
Result := GlobalErlangData.Exe64; end ;
197
- function ConstGetExistingErlangPath (Param: String): String; begin
197
+ function ConstGetLatestErlangPath (Param: String): String; begin
198
198
Result := GetLatestErlangPath; end ;
199
199
function ConstGetSelectedReleaseVersion (Param: String): String; begin
200
200
Result := CacheSelectedRelease.Version; end ;
0 commit comments