From 412d527d01d5ca5781a84cb2b86c8e729bb64eeb Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Tue, 13 Oct 2015 15:25:07 -0700 Subject: [PATCH] Check all DNX_HOME env variables in LibuvCopier - Report error if the HOME env variable is required and not set on Linux --- .../Program.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs b/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs index 9d9c1f3280..3904cfc2ed 100644 --- a/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs +++ b/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs @@ -23,7 +23,9 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier if (string.IsNullOrEmpty(packagesFolder)) { - var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME"); + var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME") ?? + Environment.GetEnvironmentVariable("DNX_USER_HOME") ?? + Environment.GetEnvironmentVariable("DNX_GLOBAL_HOME"); var firstCandidate = dnxFolder?.Split(';') ?.Select(path => Environment.ExpandEnvironmentVariables(path)) @@ -79,7 +81,14 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier } else { - return Environment.GetEnvironmentVariable("HOME"); + var home = Environment.GetEnvironmentVariable("HOME"); + + if (string.IsNullOrEmpty(home)) + { + throw new Exception("Home directory not found. The HOME environment variable is not set."); + } + + return home; } #endif }