Skip to content

use path separator instead of hardcoded semicolon #11730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vzarytovskii merged 2 commits into from
Jun 28, 2021
Merged

use path separator instead of hardcoded semicolon #11730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8abfea1
use path separator instead of hardcoded semicolon
baronfel Jun 25, 2021
1a3efb0
Update src/fsharp/DependencyManager/NativeDllResolveHandler.fs
baronfel Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/fsharp/DependencyManager/NativeDllResolveHandler.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,25 +111,26 @@ type NativeDllResolveHandler (nativeProbingRoots: NativeResolutionProbe) =
else
None

let appendSemiColon (p: string) =
if not(p.EndsWith(";", StringComparison.OrdinalIgnoreCase)) then
p + ";"
let appendPathSeparator (p: string) =
let separator = string System.IO.Path.PathSeparator
if not(p.EndsWith(separator, StringComparison.OrdinalIgnoreCase)) then
p + separator
else
p

let addedPaths = ConcurrentBag<string>()

let addProbeToProcessPath probePath =
let probe = appendSemiColon probePath
let path = appendSemiColon (Environment.GetEnvironmentVariable("PATH"))
let probe = appendPathSeparator probePath
let path = appendPathSeparator (Environment.GetEnvironmentVariable("PATH"))
if not (path.Contains(probe)) then
Environment.SetEnvironmentVariable("PATH", path + probe)
addedPaths.Add probe

let removeProbeFromProcessPath probePath =
if not(String.IsNullOrWhiteSpace(probePath)) then
let probe = appendSemiColon probePath
let path = appendSemiColon (Environment.GetEnvironmentVariable("PATH"))
let probe = appendPathSeparator probePath
let path = appendPathSeparator (Environment.GetEnvironmentVariable("PATH"))
if path.Contains(probe) then Environment.SetEnvironmentVariable("PATH", path.Replace(probe, ""))

member internal _.RefreshPathsInEnvironment(roots: string seq) =
Expand Down