From 772a7938a0be9a6414ac4049e7b8ad93f3aedb48 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 16 Apr 2015 11:41:23 -0400 Subject: [PATCH 1/2] use emby for program data on mac --- MediaBrowser.Server.Mac/Main.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 0a1fd1b3d..b4184f3b1 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -62,6 +62,10 @@ namespace MediaBrowser.Server.Mac { // TODO: Use CommonApplicationData? Will we always have write access? programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "mediabrowser-server"); + + if (!Directory.Exists (programDataPath)) { + programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "emby-server"); + } } // Within the mac bundle, go uo two levels then down into Resources folder From f6260db9f172398ebf1b25ade8e5e8613d3e43af Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 16 Apr 2015 11:55:45 -0400 Subject: [PATCH 2/2] update mac to emby --- MediaBrowser.Server.Mac.sln | 2 +- MediaBrowser.Server.Mac.userprefs | 31 +++++++++---------- ...rver.Mac.csproj => Emby.Server.Mac.csproj} | 1 + MediaBrowser.Server.Mac/Info.plist | 2 +- 4 files changed, 17 insertions(+), 19 deletions(-) rename MediaBrowser.Server.Mac/{MediaBrowser.Server.Mac.csproj => Emby.Server.Mac.csproj} (98%) diff --git a/MediaBrowser.Server.Mac.sln b/MediaBrowser.Server.Mac.sln index 3d7c5e882..3167aa65f 100644 --- a/MediaBrowser.Server.Mac.sln +++ b/MediaBrowser.Server.Mac.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Mac", "MediaBrowser.Server.Mac\MediaBrowser.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Mac", "MediaBrowser.Server.Mac\Emby.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Api", "MediaBrowser.Api\MediaBrowser.Api.csproj", "{4FD51AC5-2C16-4308-A993-C3A84F3B4582}" EndProject diff --git a/MediaBrowser.Server.Mac.userprefs b/MediaBrowser.Server.Mac.userprefs index fd846d5e5..b5f227685 100644 --- a/MediaBrowser.Server.Mac.userprefs +++ b/MediaBrowser.Server.Mac.userprefs @@ -1,26 +1,20 @@  - - + + - - - - - + + + + + + + + - - - - - - - - - - + @@ -32,4 +26,7 @@ + + MediaBrowser.Server.Mac/Emby.Server.Mac.csproj + \ No newline at end of file diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj similarity index 98% rename from MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj rename to MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 005d6fd56..8592fc460 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -13,6 +13,7 @@ MediaBrowser.Server.Mac.MainClass + A personal media server true diff --git a/MediaBrowser.Server.Mac/Info.plist b/MediaBrowser.Server.Mac/Info.plist index ffb4b31ee..73c2036b1 100644 --- a/MediaBrowser.Server.Mac/Info.plist +++ b/MediaBrowser.Server.Mac/Info.plist @@ -5,7 +5,7 @@ CFBundleIconFile appicon CFBundleIdentifier - com.MediaBrowser.MediaBrowser.Server.Mac + com.emby.server CFBundleName Media Browser CFBundleShortVersionString