diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index d1a24ab127..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 @@ -655,9 +652,6 @@ Resources\dashboard-ui\wizarduser.html - - Resources\dashboard-ui\css\.DS_Store - Resources\dashboard-ui\css\card.css @@ -739,6 +733,9 @@ Resources\dashboard-ui\css\images\checkmarkgreen.png + + Resources\dashboard-ui\css\images\empty.png + Resources\dashboard-ui\css\images\favicon.ico @@ -751,6 +748,9 @@ Resources\dashboard-ui\css\images\logindefault.png + + Resources\dashboard-ui\css\images\logo536.png + Resources\dashboard-ui\css\images\mblogoicon.png @@ -760,9 +760,6 @@ Resources\dashboard-ui\css\images\rotten.png - - Resources\dashboard-ui\css\images\server.png - Resources\dashboard-ui\css\images\splash.jpg @@ -949,9 +946,6 @@ Resources\dashboard-ui\css\images\icons\volumeup.png - - Resources\dashboard-ui\css\images\icons\wireless.png - Resources\dashboard-ui\css\images\items\detail\audio.png @@ -1303,6 +1297,9 @@ Resources\dashboard-ui\scripts\livetvchannels.js + + Resources\dashboard-ui\scripts\livetvcomponents.js + Resources\dashboard-ui\scripts\livetvguide.js @@ -1468,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 @@ -1588,12 +1591,27 @@ Resources\dashboard-ui\thirdparty\cast_sender.js + + Resources\dashboard-ui\thirdparty\fastclick.js + + + Resources\dashboard-ui\thirdparty\headroom.js + Resources\dashboard-ui\thirdparty\jquery-2.1.1.min.js Resources\dashboard-ui\thirdparty\jquery.unveil-custom.js + + Resources\dashboard-ui\thirdparty\masonry.pkgd.min.js + + + Resources\dashboard-ui\thirdparty\require.js + + + Resources\dashboard-ui\thirdparty\requirecss.js + Resources\dashboard-ui\thirdparty\apiclient\ajax.js @@ -1648,9 +1666,33 @@ 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 + + + Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js + Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css + + Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css.map + Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.min.css @@ -1669,6 +1711,9 @@ Resources\dashboard-ui\thirdparty\fontawesome\fonts\fontawesome-webfont.woff + + Resources\dashboard-ui\thirdparty\fontawesome\fonts\fontawesome-webfont.woff2 + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.css 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(); + + _logger.Info ("Executable: {0}", module); + _logger.Info ("Arguments: {0}", commandLineArgsString); - Process.Start(currentProcess.MainModule.FileName, commandLineArgsString); + Process.Start(module, commandLineArgsString); _logger.Info("AppController.Terminate"); MenuBarIcon.Instance.Terminate();