Release v0.0.14-alpha

Summary:
  * Enable option `ExpandEnvVars` and as a result remove
    home grown epansion code.
  * Add special environment variable `ScriptDir` for easier
    bundling with `plink` and `pageant`.
  * Change `DefaultVariables` from `Select` to `Switch` to
    make it easier adding more vars in the future.

README.md

@@ -67,6 +67,11 @@ plink_options = -N -A -v -batch
   final destination.
 * `plink_options` are the global options used to spawn the connection.
 
+Since version `v0.0.14-alpha` a special environmental variable called `%ScriptDir%`
+has been added. It expands to the directory where the `PlinkProxy.exe` is run from.
+This is a handy shortcut for the `path` defintion should `plink.exe` and 
+`pageant.exe` be located in the same directory as `PlinkProxy.exe`.
+
 ### Example Socks
 
 ```ini

src/PlinkProxy.au3

@@ -67,20 +67,26 @@ Global $RefreshInterval = 5000
 ; Options
 ; --------------------------------------------------------------------------------------------------------------
 Opt("GUIResizeMode", $GUI_DOCKALL)
+Opt("ExpandEnvStrings", 1)
 Opt("MustDeclareVars", 1)
 
+; --------------------------------------------------------------------------------------------------------------
+; Define Autoit Environment Variables
+; --------------------------------------------------------------------------------------------------------------
+EnvSet('ScriptDir', @ScriptDir)
+
 ; --------------------------------------------------------------------------------------------------------------
 ; Functions
 ; --------------------------------------------------------------------------------------------------------------
 
 ; Return a default value for a field default is 'n/a'
 Func DefaultValues($Field)
-    Select
-    Case $Field = 'jump_port'
+    Switch $Field
+    Case 'jump_port'
       Return 22
     Case Else
       Return 'n/a'
-    EndSelect
+    EndSwitch
 EndFunc
 
 ; --------------------------------------------------------------------------------------------------------------
@@ -158,27 +164,10 @@ Func FetchEntry($Section, $Field, $Prefix = "")
     Return IniRead($ConfigFile, $Section, $Field, DefaultValues($Field))
 EndFunc
 
-; --------------------------------------------------------------------------------------------------------------
-
- Func EvaluatePath($Path)
-    Local $ModifiedPath
-    If Not StringInStr($Path, '%') Then
-       Return $Path
-    EndIf
-    Local $Variables = StringRegExp($Path, "%.[^%]*%", 1)
-    For $Index = 0 To $Variables[0]
-        Local $EnvName  = $Variables[$Index]
-        Local $EnvValue = EnvGet(StringReplace($EnvName, "%", ""))
-        $ModifiedPath   = StringReplace($Path, $EnvName, $EnvValue)
-    Next
-    Logger('Debug', "Replacing '" & $Path & "' with '" & $ModifiedPath & "'")
-    Return $ModifiedPath
-EndFunc
-
 ; --------------------------------------------------------------------------------------------------------------
 
 Func UpdatePath()
-    Local $Path    = EvaluatePath($Globals('path'))
+    Local $Path    = $Globals('path')
     Local $EnvPath = EnvGet('PATH')
     EnvSet('PATH', $EnvPath & ';' & $Path)
     EnvUpdate()
@@ -336,18 +325,8 @@ EndFunc
 
 ; --------------------------------------------------------------------------------------------------------------
 
-Func SshKeysDir()
-    If IsDeclared('SshKeysDir') Then
-        Return $SshKeysDir
-    EndIf
-    Global $SshKeysDir = EvaluatePath($Globals('ssh_keys_dir'))
-    Return $SshKeysDir
-EndFunc
-
-; --------------------------------------------------------------------------------------------------------------
-
 Func FindSshKeys()
-    Local $SshKeys = _FileListToArray(SshKeysDir(), '*ppk')
+    Local $SshKeys = _FileListToArray($Globals('ssh_keys_dir'), '*ppk')
     If Not Ubound($SshKeys) Then
         Return ""
     EndIf
@@ -359,7 +338,7 @@ EndFunc
 Func StartPageant()
     Local $Pageant = 'Pageant.exe'
     If Not ProcessExists($Pageant) Then
-        ShellExecute($Pageant, FindSshKeys(), SshKeysDir(), "", @SW_HIDE)
+        ShellExecute($Pageant, FindSshKeys(), $Globals('ssh_keys_dir'), "", @SW_HIDE)
         Logger('Info', 'Starting peageant to load ssh keys')
     EndIf
 EndFunc

src/Version.au3

@@ -1,7 +1,7 @@
 ; ---------------------------------------------------------------------------------
 ; Version file used by the make, packaging and compile tools
 ; ---------------------------------------------------------------------------------
-Global Const $VERSION       = "0.0.13-alpha"
+Global Const $VERSION       = "0.0.14-alpha"
 Global Const $VERSION_MAJOR = (StringSplit($VERSION, '.-'))[1]
 Global Const $VERSION_MINOR = (StringSplit($VERSION, '.-'))[2]
 Global Const $VERSION_PATCH = (StringSplit($VERSION, '.-'))[3]