diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-05 12:58:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 12:58:44 -0400 |
| commit | 01dee97c4464b1e0eb3b619f9d39bb0d580ed3b8 (patch) | |
| tree | e08e8a541a88de1826a5063a7299ee39c0b2c98a | |
| parent | e50ce1dfbd6ee24f68c66b303ea369ddb317f3fb (diff) | |
| parent | 97d21723f32e50fe3137f6899f7ed62b3fb68e47 (diff) | |
Merge pull request #1922 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 27 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 22 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 19ae7b4d21..4011fa3de3 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -183,6 +183,14 @@ namespace MediaBrowser.Server.Mono.Native { info.SystemArchitecture = Architecture.Arm; } + else if (System.Environment.Is64BitOperatingSystem) + { + info.SystemArchitecture = Architecture.X64; + } + else + { + info.SystemArchitecture = Architecture.X86; + } info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ? System.Environment.OSVersion.VersionString : @@ -198,14 +206,21 @@ namespace MediaBrowser.Server.Mono.Native if (_unixName == null) { var uname = new Uname(); - Utsname utsname; - var callResult = Syscall.uname(out utsname); - if (callResult == 0) + try { - uname.sysname = utsname.sysname; - uname.machine = utsname.machine; - } + Utsname utsname; + var callResult = Syscall.uname(out utsname); + if (callResult == 0) + { + uname.sysname = utsname.sysname ?? string.Empty; + uname.machine = utsname.machine ?? string.Empty; + } + } + catch (Exception ex) + { + Logger.ErrorException("Error getting unix name", ex); + } _unixName = uname; } return _unixName; diff --git a/SharedVersion.cs b/SharedVersion.cs index bd39b81319..9b08f21287 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.56")] +[assembly: AssemblyVersion("3.0.5984")] |