huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split the DNX_HOME environment variable when it is a semi-colon separated list

This commit is contained in:
Troy Dai 2015-10-13 15:01:16 -07:00 committed by Stephen Halter
parent 06e895b7b6
commit a198ae39cc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs
View File

@ -25,10 +25,19 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier
{ {
var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME"); var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME");
if (string.IsNullOrEmpty(dnxFolder)) var firstCandidate = dnxFolder?.Split(';')
?.Select(path => Environment.ExpandEnvironmentVariables(path))
?.Where(path => Directory.Exists(path))
?.FirstOrDefault();
if (string.IsNullOrEmpty(firstCandidate))
{ {
dnxFolder = Path.Combine(GetHome(), ".dnx"); dnxFolder = Path.Combine(GetHome(), ".dnx");
} }
else
{
dnxFolder = firstCandidate;
}
packagesFolder = Path.Combine(dnxFolder, "packages"); packagesFolder = Path.Combine(dnxFolder, "packages");
} }
@ -50,7 +59,7 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier
} }
} }
} }
catch(Exception ex) catch (Exception ex)
{ {
Console.WriteLine(ex); Console.WriteLine(ex);
throw; throw;