custom path-editing, offer to add escripts dir

Author: chyndman

Elixir.iss

@@ -26,6 +26,9 @@
   #endif
 #endif
 
+#define ELIXIR_PATH '{app}\bin'
+#define ESCRIPT_PATH '%USERPROFILE%\.mix\escripts'
+
 [Setup]
 AppName=Elixir
 AppPublisher=ElixirLang
@@ -60,20 +63,47 @@ Source: "elixir\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
 [Icons]
 Name: "{group}\Elixir"; Filename: "werl.exe"; WorkingDir: "%userprofile%"; IconFilename: "{app}\drop.ico"; IconIndex: 0; Parameters: "-env ERL_LIBS ""{app}\lib"" -user Elixir.IEx.CLI -extra --no-halt"
 
-
 [Tasks]
-Name: modifypath; Description: "Append {app}\bin to Path environment variable"
+Name: elixirpath; Description: "Append {#ELIXIR_PATH} to system PATH"; Check: CheckToAppendElixirPath
+Name: escriptpath; Description: "Append {#ESCRIPT_PATH} to system PATH"; Check: CheckToAppendEscriptPath
 
 [Code]
-// All of this code is used by modpath.iss to determine which path(s) to add and the corresponding task
-const 
-    ModPathName = 'modifypath'; 
-    ModPathType = 'system'; 
+#include "src\util.iss"
+#include "src\path.iss"
 
-function ModPathDir(): TArrayOfString; 
-begin 
-    setArrayLength(Result, 1) 
-    Result[0] := ExpandConstant('{app}\bin'); 
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+	if CurStep = ssPostInstall then begin
+		if IsTaskSelected('elixirpath') then begin
+			AppendPath(ExpandConstant('{#ELIXIR_PATH}'));
+    end;
+    if IsTaskSelected('escriptpath') then begin
+      AppendPath(ExpandConstant('{#ESCRIPT_PATH}'));
+    end;
+  end;
 end;
- 
-#include "src\legroom\modpath.iss"
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+	SelTaskString: String;
+  SelTasks: TStringList;
+  ElixirIdx: Integer;
+  EscriptIdx: Integer;
+begin
+	if CurUninstallStep = usUninstall then begin
+		SelTaskString := '';
+    RegQueryStringValue(HKLM, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\Elixir_is1', 'Inno Setup: Selected Tasks', SelTaskString);
+
+		if Pos('elixirpath', SelTaskString) <> 0 then
+			DeletePath(ExpandConstant('{#ELIXIR_PATH}'));
+    
+    if Pos('escriptpath', SelTaskString) <> 0 then
+      DeletePath(ExpandConstant('{#ESCRIPT_PATH}'));
+	end;
+end;
+
+function CheckToAppendElixirPath: Boolean; begin
+  Result := not ContainsPath(ExpandConstant('{#ELIXIR_PATH}')); end;
+
+function CheckToAppendEscriptPath: Boolean; begin
+  Result := not ContainsPath(ExpandConstant('{#ESCRIPT_PATH}')); end;

ElixirWeb.iss

@@ -55,7 +55,8 @@ Source: "Elixir.iss"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "assets\drop.ico"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
 Source: "assets\drop_banner.bmp"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
 Source: "assets\null.bmp"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
-Source: "src\legroom\modpath.iss"; DestDir: "{tmp}\src\legroom"; Flags: deleteafterinstall
+Source: "src\util.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
+Source: "src\path.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
 ; 7-Zip portable extractor
 Source: "bin\7za.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
 ; Compiler files
@@ -84,12 +85,12 @@ Name: "unins_previous"; Description: "Uninstall previous version at {#StrInspect
 Name: "erlang"; Description: "Install Erlang"; Check: CheckToInstallErlang
 Name: "erlang\32"; Description: "{#StrInspectScriptConst('GlobalErlangData.Name32')}"; Flags: exclusive
 Name: "erlang\64"; Description: "{#StrInspectScriptConst('GlobalErlangData.Name64')}"; Flags: exclusive; Check: IsWin64
-Name: "erlang\newpath"; Description: "Append Erlang directory to Path environment variable"
-Name: "existingpath"; Description: "Append {#StrInspectScriptConst('GetLatestErlangPath')}\bin to Path environment variable"; Check: CheckToAddExistingErlangPath
+Name: "erlang\newpath"; Description: "Append Erlang directory to system PATH"
+Name: "existingpath"; Description: "Append {#StrInspectScriptConst('GetLatestErlangPath')}\bin to system PATH"; Check: CheckToAddExistingErlangPath
 
 [Code]
 #include "src\util.iss"
-#include "src\registry.iss"
+#include "src\path.iss"
 #include "src\elixir_release.iss"
 #include "src\elixir_lookup.iss"
 #include "src\erlang_data.iss"

src/erlang_env.iss

@@ -30,9 +30,10 @@ begin
     SubKeyName := 'SOFTWARE\Ericsson\Erlang';
   end;
 
-  ERTSVersions := FuncRegGetSubkeyNames(HKEY_LOCAL_MACHINE, SubKeyName);
-  if GetArrayLength(ERTSVersions) <> 0 then
-    Result := FuncRegQueryStringValue(HKEY_LOCAL_MACHINE, SubKeyName + '\' + GetLatestVersion(ERTSVersions), '');
+  if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, SubKeyName, ERTSVersions) then begin
+    if GetArrayLength(ERTSVersions) <> 0 then
+      RegQueryStringValue(HKEY_LOCAL_MACHINE, SubKeyName + '\' + GetLatestVersion(ERTSVersions), '', Result);
+  end;
 end;
 
 // Returns the path of the latest Erlang installation, preferring

src/path.iss

@@ -0,0 +1,67 @@
+// path.iss - Manipulate the PATH variable
+// Copyright (c) Chris Hyndman
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+[Code]
+
+const
+  PathVarRegRoot = HKEY_LOCAL_MACHINE;
+  PathVarRegPath = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
+  
+function ContainsPath(Dir: String): Boolean;
+var
+  RegValue: String;
+begin
+  Result := False;
+  if Dir <> '' then begin
+    RegQueryStringValue(PathVarRegRoot, PathVarRegPath, 'Path', RegValue);
+    if Pos(Dir, RegValue) <> 0 then
+      Result := True;
+  end;
+end;
+
+// Given a directory path, appends the directory to the system's Path environment variable,
+// if it doesn't already exist
+procedure AppendPath(Dir: String);
+var
+  RegValue: String;
+begin
+  if Dir <> '' then begin
+    RegQueryStringValue(PathVarRegRoot, PathVarRegPath, 'Path', RegValue);
+    if Pos(Dir, RegValue) = 0 then begin
+      RegWriteStringValue(PathVarRegRoot, PathVarRegPath, 'Path', RegValue + ';' + Dir);
+    end;
+  end;
+end;
+
+// Given a directory path, deletes the directory from the system's Path environment variable,
+// if it exists
+procedure DeletePath(Dir: String);
+var
+  RegValue: String;
+  DirIdx: Integer;
+begin
+  if Dir <> '' then begin
+    RegQueryStringValue(PathVarRegRoot, PathVarRegPath, 'Path', RegValue);
+    DirIdx := Pos(Dir, RegValue);
+    if DirIdx <> 0 then begin
+      if DirIdx = 1 then begin
+        Delete(RegValue, 1, Length(Dir) + 1);
+      end else begin
+        Delete(RegValue, DirIdx - 1, Length(Dir) + 1);
+      end;
+      RegWriteStringValue(PathVarRegRoot, PathVarRegPath, 'Path', RegValue);
+    end;
+  end;
+end;