michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
LukePulverenti 2013-03-13 10:01:18 -04:00
commit 8405c17d25
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 product = app == MBApplication.MBTheater ? "mbt" : "server";
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
}

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

@ -27,6 +27,7 @@ namespace MediaBrowser.Installer
protected string TargetExe = "MediaBrowser.ServerApplication.exe";
protected string FriendlyName = "Media Browser Server";
protected string Archive = null;
protected bool InstallPismo = true;
protected string RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser-Server");
protected bool SystemClosing = false;
@ -91,6 +92,7 @@ namespace MediaBrowser.Installer
}
Archive = args.GetValueOrDefault("archive", null);
if (args.GetValueOrDefault("pismo","true") == "false") InstallPismo = false;
var product = args.GetValueOrDefault("product", null) ?? ConfigurationManager.AppSettings["product"] ?? "server";
PackageClass = (PackageVersionClass) Enum.Parse(typeof (PackageVersionClass), args.GetValueOrDefault("class", null) ?? ConfigurationManager.AppSettings["class"] ?? "Release");
@ -250,14 +252,17 @@ namespace MediaBrowser.Installer
}
// Install Pismo
try
if (InstallPismo)
{
InstallPismo();
}
catch (Exception e)
{
SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message);
return;
try
{
PismoInstall();
}
catch (Exception e)
{
SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message);
return;
}
}
// 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
var pismo = new Process();