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

Don't install pismo during update #47

Browse Source
This commit is contained in:
Eric Reed 2013-03-13 08:51:33 -04:00
parent ff55da9029
commit 13140003a6
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs
View File

@ -24,7 +24,7 @@ namespace MediaBrowser.Common.Implementations.Updates
var target = Path.Combine(Path.GetTempPath(), UpdaterExe); var target = Path.Combine(Path.GetTempPath(), UpdaterExe);
var product = app == MBApplication.MBTheater ? "mbt" : "server"; var product = app == MBApplication.MBTheater ? "mbt" : "server";
File.Copy(source, target, true); File.Copy(source, target, true);
Process.Start(target, string.Format("product={0} archive=\"{1}\" caller={2}", product, archive, Process.GetCurrentProcess().Id)); Process.Start(target, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false", product, archive, Process.GetCurrentProcess().Id));
// That's it. The installer will do the work once we exit // That's it. The installer will do the work once we exit
} }

21
MediaBrowser.Installer/MainWindow.xaml.cs
View File

@ -27,6 +27,7 @@ namespace MediaBrowser.Installer
protected string TargetExe = "MediaBrowser.ServerApplication.exe"; protected string TargetExe = "MediaBrowser.ServerApplication.exe";
protected string FriendlyName = "Media Browser Server"; protected string FriendlyName = "Media Browser Server";
protected string Archive = null; protected string Archive = null;
protected bool InstallPismo = true;
protected string RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser-Server"); protected string RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser-Server");
protected bool SystemClosing = false; protected bool SystemClosing = false;
@ -91,6 +92,7 @@ namespace MediaBrowser.Installer
} }
Archive = args.GetValueOrDefault("archive", null); Archive = args.GetValueOrDefault("archive", null);
if (args.GetValueOrDefault("pismo","true") == "false") InstallPismo = false;
var product = args.GetValueOrDefault("product", null) ?? ConfigurationManager.AppSettings["product"] ?? "server"; var product = args.GetValueOrDefault("product", null) ?? ConfigurationManager.AppSettings["product"] ?? "server";
PackageClass = (PackageVersionClass) Enum.Parse(typeof (PackageVersionClass), args.GetValueOrDefault("class", null) ?? ConfigurationManager.AppSettings["class"] ?? "Release"); PackageClass = (PackageVersionClass) Enum.Parse(typeof (PackageVersionClass), args.GetValueOrDefault("class", null) ?? ConfigurationManager.AppSettings["class"] ?? "Release");
@ -250,14 +252,17 @@ namespace MediaBrowser.Installer
} }
// Install Pismo // Install Pismo
try if (InstallPismo)
{ {
InstallPismo(); try
} {
catch (Exception e) PismoInstall();
{ }
SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message); catch (Exception e)
return; {
SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message);
return;
}
} }
// And run // And run
@ -275,7 +280,7 @@ namespace MediaBrowser.Installer
} }
private void InstallPismo() private void PismoInstall()
{ {
// Kick off the Pismo installer and wait for it to end // Kick off the Pismo installer and wait for it to end
var pismo = new Process(); var pismo = new Process();