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

Commit 0072683

Browse files
committed
Replace AppendErlangPath with appropriate function composition
1 parent 64f6c4d commit 0072683

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ElixirWeb.iss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Source: "compiler:Setup.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
5858
Source: "compiler:SetupLdr.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
5959

6060
[Run]
61-
Filename: "{tmp}\{code:ConstGetErlangExe32}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetErlangName32}..."; Tasks: erlang\32; AfterInstall: AppendErlangPathIfTaskSelected(False)
62-
Filename: "{tmp}\{code:ConstGetErlangExe64}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetErlangName64}..."; Tasks: erlang\64; AfterInstall: AppendErlangPathIfTaskSelected(True)
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)
6363
Filename: "{tmp}\7za.exe"; Parameters: "x -oelixir Precompiled.zip"; WorkingDir: "{tmp}"; StatusMsg: "Extracting Precompiled.zip archive..."
6464
Filename: "{tmp}\ISCC.exe"; Parameters: "/dElixirVersion={code:ConstGetSelectedReleaseVersion} /dSkipWelcome /dNoCompression Elixir.iss"; WorkingDir: "{tmp}"; StatusMsg: "Compiling Elixir installer..."
6565
Filename: "{tmp}\Output\elixir-v{code:ConstGetSelectedReleaseVersion}-setup.exe"; Flags: nowait; StatusMsg: "Starting Elixir installer..."
@@ -91,10 +91,10 @@ var
9191
9292
CacheSelectedRelease: TElixirRelease;
9393
94-
procedure AppendErlangPathIfTaskSelected(Of64Bit: Boolean);
94+
procedure AppendNewErlangPathIfTaskSelected(Of64Bit: Boolean);
9595
begin
96-
if IsTaskSelected('erlang\newpath') or IsTaskSelected('existingpath') then
97-
AppendErlangPath(Of64Bit, GlobalErlangData.ERTSVersion);
96+
if IsTaskSelected('erlang\newpath') then
97+
AppendPath(GetLatestErlangPathOfArch(Of64Bit) + '\bin');
9898
end;
9999
100100
procedure CurPageChanged(CurPageID: Integer);

0 commit comments

Comments
 (0)