Consolidate functions used for checks and scripted constants

Author: chyndman

ElixirWeb.iss

@@ -165,16 +165,6 @@ begin
   Result := 'OTP ' + ErlangCSVInfo[0] + ' (64-bit)'
 end;
 
-function ConstGetOTP32Name(Param: String): String;
-begin
-  Result := GetOTP32Name;
-end;
-
-function ConstGetOTP64Name(Param: String): String;
-begin
-  Result := GetOTP64Name;
-end;
-
 function GetERTSVersion: String;
 begin
   Result := ErlangCSVInfo[1];
@@ -200,16 +190,6 @@ begin
   Result := ExpandConstant('{tmp}\' + GetURLFilePart(GetOTP64URL));
 end;
 
-function ConstGetOTP32Exe(Param: String): String;
-begin
-  Result := GetOTP32Exe;
-end;
-
-function ConstGetOTP64Exe(Param: String): String;
-begin
-  Result := GetOTP64Exe;
-end;
-
 function CSVToStringTable(Filename: String): TStringTable;
 var
   Rows: TArrayOfString;
@@ -284,11 +264,6 @@ begin
   end;
 end;
 
-function ConstGetSelectedReleaseVersion(Param: String): String;
-begin
-  Result := GetVersion(GetSelectedRelease());
-end;
-
 function GetErlangPath(Of64Bit: Boolean): String;
 var
   Versions: TArrayOfString;
@@ -317,16 +292,6 @@ begin
   Result := Exec('erl.exe', '+V', '', SW_HIDE, ewWaitUntilTerminated, _int);
 end;
 
-function CheckToInstallErlang: Boolean;
-begin
-  Result := (not ErlangInPath) and ((GetErlangPath(False) = '') or (GetErlangPath(True) = ''));
-end;
-
-function CheckToAddErlangPath: Boolean;
-begin
-  Result := not ErlangInPath;
-end;
-
 procedure AppendErlangPathIfTaskSelected(Of64Bit: Boolean);
 var
   Path: String;
@@ -403,3 +368,14 @@ begin
     exit;
   end;
 end;
+
+function CheckToInstallErlang: Boolean; begin
+  Result := (not ErlangInPath) and ((GetErlangPath(False) = '') or (GetErlangPath(True) = '')); end;
+function CheckToAddErlangPath: Boolean; begin
+  Result := not ErlangInPath; end;
+
+function ConstGetOTP32Name(Param: String): String; begin Result := GetOTP32Name; end;
+function ConstGetOTP64Name(Param: String): String; begin Result := GetOTP64Name; end;
+function ConstGetOTP32Exe(Param: String): String;  begin Result := GetOTP32Exe; end;
+function ConstGetOTP64Exe(Param: String): String;  begin Result := GetOTP64Exe; end;
+function ConstGetSelectedReleaseVersion(Param: String): String; begin Result := GetVersion(GetSelectedRelease()); end;