update startup wizard

This commit is contained in:
Luke Pulverenti
2016-06-23 13:04:18 -04:00
parent 82e8085747
commit cffc9417c7
20 changed files with 192 additions and 90 deletions

View File

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Reflection;
using System.Text.RegularExpressions;
using MediaBrowser.Controller.Power;
using MediaBrowser.Model.System;
using MediaBrowser.Server.Implementations.Persistence;
using MediaBrowser.Server.Startup.Common.FFMpeg;
using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
@@ -176,7 +177,7 @@ namespace MediaBrowser.Server.Mono.Native
}
else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase))
{
info.SystemArchitecture = Architecture.X86_X64;
info.SystemArchitecture = Architecture.X64;
}
else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase))
{
@@ -260,7 +261,7 @@ namespace MediaBrowser.Server.Mono.Native
switch (environment.SystemArchitecture)
{
case Architecture.X86_X64:
case Architecture.X64:
info.Version = "20160124";
break;
case Architecture.X86:
@@ -283,7 +284,7 @@ namespace MediaBrowser.Server.Mono.Native
switch (environment.SystemArchitecture)
{
case Architecture.X86_X64:
case Architecture.X64:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z"
@@ -300,7 +301,7 @@ namespace MediaBrowser.Server.Mono.Native
switch (environment.SystemArchitecture)
{
case Architecture.X86_X64:
case Architecture.X64:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z"