diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 03c69901ea..b0db9fb984 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -259,9 +259,6 @@ - - Resources\dashboard-ui\.DS_Store - Resources\dashboard-ui\about.html @@ -301,9 +298,6 @@ Resources\dashboard-ui\connectlogin.html - - Resources\dashboard-ui\cordovaindex.html - Resources\dashboard-ui\dashboard.html @@ -658,9 +652,6 @@ Resources\dashboard-ui\wizarduser.html - - Resources\dashboard-ui\css\.DS_Store - Resources\dashboard-ui\css\card.css @@ -1306,6 +1297,9 @@ Resources\dashboard-ui\scripts\livetvchannels.js + + Resources\dashboard-ui\scripts\livetvcomponents.js + Resources\dashboard-ui\scripts\livetvguide.js @@ -1471,9 +1465,15 @@ Resources\dashboard-ui\scripts\pluginspage.js + + Resources\dashboard-ui\scripts\queryfilters.js + Resources\dashboard-ui\scripts\ratingdialog.js + + Resources\dashboard-ui\scripts\registrationservices.js + Resources\dashboard-ui\scripts\remotecontrol.js @@ -1666,6 +1666,21 @@ Resources\dashboard-ui\thirdparty\apiclient\alt\events.js + + Resources\dashboard-ui\thirdparty\cordova\chromecast.js + + + Resources\dashboard-ui\thirdparty\cordova\connectsdk.js + + + Resources\dashboard-ui\thirdparty\cordova\generaldevice.js + + + Resources\dashboard-ui\thirdparty\cordova\imagestore.js + + + Resources\dashboard-ui\thirdparty\cordova\registrationservices.js + Resources\dashboard-ui\thirdparty\cordova\remotecontrols.js diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 1dc9758419..0802b97b93 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -153,14 +153,17 @@ namespace MediaBrowser.Server.Mac _logger.Info("Starting new instance"); - var currentProcess = Process.GetCurrentProcess(); - var args = Environment.GetCommandLineArgs() + .Skip(1) .Select(NormalizeCommandLineArgument); var commandLineArgsString = string.Join(" ", args.ToArray()); + var module = Environment.GetCommandLineArgs().First(); - Process.Start(currentProcess.MainModule.FileName, commandLineArgsString); + _logger.Info ("Executable: {0}", module); + _logger.Info ("Arguments: {0}", commandLineArgsString); + + Process.Start(module, commandLineArgsString); _logger.Info("AppController.Terminate"); MenuBarIcon.Instance.Terminate();