Added %PROGRAMDATA% support for #163
This commit is contained in:
@@ -259,6 +259,10 @@ Public Class mgrPath
|
||||
sReplace = "%COMMONDOCUMENTS%"
|
||||
sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "system.reg")
|
||||
oParse = New Regex("""Common Documents""="".+?(?=\n)")
|
||||
ElseIf sPath.Contains("%PROGRAMDATA%") Then
|
||||
sReplace = "%PROGRAMDATA%"
|
||||
sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "system.reg")
|
||||
oParse = New Regex("""Common AppData""="".+?(?=\n)")
|
||||
ElseIf sPath.Contains("%USERPROFILE%") Then
|
||||
sReplace = "%USERPROFILE%"
|
||||
sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "user.reg")
|
||||
@@ -315,6 +319,8 @@ Public Class mgrPath
|
||||
hshEnvs.Add("Documents", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
|
||||
hshEnvs.Add("AppDataRoaming", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData))
|
||||
hshEnvs.Add("AppDataLocal", Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData))
|
||||
hshEnvs.Add("ProgramData", Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData))
|
||||
|
||||
If Not mgrCommon.IsUnix Then
|
||||
hshEnvs.Add("UserData", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
|
||||
hshEnvs.Add("PublicDocuments", Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
|
||||
@@ -416,6 +422,8 @@ Public Class mgrPath
|
||||
Dim sCurrentUser As String = "%USERPROFILE%"
|
||||
Dim sHomeDir As String = "~"
|
||||
Dim sEnvCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
|
||||
Dim sProgramData As String = "%PROGRAMDATA%"
|
||||
Dim sEnvProgramData As String = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)
|
||||
Dim oCustomVariable As clsPathVariable
|
||||
|
||||
For Each oCustomVariable In hshCustomVariables.Values
|
||||
@@ -433,6 +441,10 @@ Public Class mgrPath
|
||||
Return sValue.Replace(sEnvAppDataLocal, sAppDataLocal)
|
||||
End If
|
||||
|
||||
If sValue.Contains(sEnvProgramData) Then
|
||||
Return sValue.Replace(sEnvProgramData, sProgramData)
|
||||
End If
|
||||
|
||||
'This needs to be tested last for Unix compatability
|
||||
If sValue.Contains(sEnvMyDocs) Then
|
||||
Return sValue.Replace(sEnvMyDocs, sMyDocs)
|
||||
|
||||
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.1.5.*")>
|
||||
<Assembly: AssemblyFileVersion("1.1.5.0")>
|
||||
<Assembly: AssemblyVersion("1.1.6.*")>
|
||||
<Assembly: AssemblyFileVersion("1.1.6.0")>
|
||||
|
||||
<Assembly: NeutralResourcesLanguageAttribute("en")>
|
||||
Reference in New Issue
Block a user