dunestorm/GBM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ~ only outside of variables

Browse Source
This commit is contained in:
Sebastian Riedel
2018-09-08 06:11:50 +02:00
parent cc8d16f4a9
commit 874dfd4c86
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBM/Managers/mgrPath.vb
+4 -2
View File
@@ -343,8 +343,9 @@ Public Class mgrPath
Dim sEnvCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) Dim sEnvCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
If mgrCommon.IsUnix Then If mgrCommon.IsUnix Then
Dim oParse As new Regex("\$([a-zA-Z0-9_]+?)") Dim oParse As new Regex("\$([a-zA-Z0-9_]+)")
Dim oParseBracketed As new Regex("\$\{([a-zA-Z0-9_]+?)\}") Dim oParseBracketed As new Regex("\$\{([a-zA-Z0-9_]+?)\}")
Dim oParseTilde As new Regex("~(?![^\$\{]*\})")
If sEnvCurrentUser = String.Empty Then If sEnvCurrentUser = String.Empty Then
'Fall back 'Fall back
sEnvCurrentUser = Environment.GetFolderPath(Environment.SpecialFolder.Personal) sEnvCurrentUser = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
@@ -357,7 +358,8 @@ Public Class mgrPath
'$HOME to ${HOME} '$HOME to ${HOME}
sValue = oParse.Replace(sValue, "${$1}") sValue = oParse.Replace(sValue, "${$1}")
'Special notations for home directory 'Special notations for home directory
sValue = sValue.Replace("~", "${HOME}") 'Don't replace inside variables
sValue = oParseTilde.Replace(sValue,"${HOME}")
'XDG Base Directory Specification has default values 'XDG Base Directory Specification has default values
sValue = sValue.Replace("${XDG_DATA_HOME}", "${XDG_DATA_HOME:-~/.local/share}") sValue = sValue.Replace("${XDG_DATA_HOME}", "${XDG_DATA_HOME:-~/.local/share}")
sValue = sValue.Replace("${XDG_CONFIG_HOME}", "${XDG_CONFIG_HOME:-~/.config}") sValue = sValue.Replace("${XDG_CONFIG_HOME}", "${XDG_CONFIG_HOME:-~/.config}")