more linux fixes

This commit is contained in:
kay.one 2013-07-25 23:11:55 -07:00
parent 67661c6893
commit 035434468e
2 changed files with 20 additions and 13 deletions

View File

@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Security.Principal;
using NLog;
@ -26,6 +27,11 @@ namespace NzbDrone.Common.EnvironmentInfo
get { return Environment.UserInteractive; }
}
static RuntimeInfo()
{
IsProduction = InternalIsProduction();
}
public bool IsAdmin
{
get
@ -45,21 +51,22 @@ namespace NzbDrone.Common.EnvironmentInfo
private static readonly string ProcessName = Process.GetCurrentProcess().ProcessName.ToLower();
public static bool IsProduction
public static bool IsProduction { get; private set; }
private static bool InternalIsProduction()
{
get
{
if (BuildInfo.IsDebug || Debugger.IsAttached) return false;
if (BuildInfo.Version.Revision > 10000) return false; //Official builds will never have such a high revision
if (BuildInfo.IsDebug || Debugger.IsAttached) return false;
if (BuildInfo.Version.Revision > 10000) return false; //Official builds will never have such a high revision
var lowerProcessName = ProcessName.ToLower();
if (lowerProcessName.Contains("vshost")) return false;
if (lowerProcessName.Contains("nunit")) return false;
if (lowerProcessName.Contains("jetbrain")) return false;
if (lowerProcessName.Contains("resharper")) return false;
var lowerProcessName = ProcessName.ToLower();
if (lowerProcessName.Contains("vshost")) return false;
if (lowerProcessName.Contains("nunit")) return false;
if (lowerProcessName.Contains("jetbrain")) return false;
if (lowerProcessName.Contains("resharper")) return false;
return true;
}
if (Directory.GetCurrentDirectory().ToLower().Contains("teamcity")) return false;
return true;
}
}
}

View File

@ -25,7 +25,7 @@ namespace NzbDrone.Common
var info = new FileInfo(path);
if (info.FullName.StartsWith(@"\\")) //UNC
if (!OsInfo.IsLinux && info.FullName.StartsWith(@"\\")) //UNC
{
return info.FullName.TrimEnd('/', '\\', ' ');
}