Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 19:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

[PTRun][Folder]Expand environment variables(#19791)

Browse Source 
* Fix for issue 19428
Expand the environmental variables before path combine

* Adding unit test
This commit is contained in:
sosssego
2022-08-10 06:26:27 -03:00
committed by GitHub
parent 3753642f23
commit 5d6160cf7a
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs
View File

@@ -84,6 +84,8 @@ namespace Microsoft.Plugin.Folder.Sources
throw new ArgumentNullException(nameof(search));
}
search = Environment.ExpandEnvironmentVariables(search);
var validRoots = new char[] { '\\', '/' };
if (validRoots.Contains(search[0]) && (search.Length == 1 || !validRoots.Contains(search[1])))
@@ -98,7 +100,7 @@ namespace Microsoft.Plugin.Folder.Sources
search = search.Length > 1 ? Path.Combine(home, search.Substring(2)) : home;
}
return Environment.ExpandEnvironmentVariables(search);
return search;
}
}
}