lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1922 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke 2016-07-05 12:58:44 -04:00 committed by GitHub
commit 01dee97c44
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
View File

@ -183,6 +183,14 @@ namespace MediaBrowser.Server.Mono.Native
{ {
info.SystemArchitecture = Architecture.Arm; info.SystemArchitecture = Architecture.Arm;
} }
else if (System.Environment.Is64BitOperatingSystem)
{
info.SystemArchitecture = Architecture.X64;
}
else
{
info.SystemArchitecture = Architecture.X86;
}
info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ? info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ?
System.Environment.OSVersion.VersionString : System.Environment.OSVersion.VersionString :
@ -198,14 +206,21 @@ namespace MediaBrowser.Server.Mono.Native
if (_unixName == null) if (_unixName == null)
{ {
var uname = new Uname(); var uname = new Uname();
Utsname utsname; try
var callResult = Syscall.uname(out utsname);
if (callResult == 0)
{ {
uname.sysname = utsname.sysname; Utsname utsname;
uname.machine = utsname.machine; 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; _unixName = uname;
} }
return _unixName; return _unixName;

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.56")] [assembly: AssemblyVersion("3.0.5984")]