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

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

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-10 17:03:48 -04:00
commit c11a61e133
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,6 @@ namespace MediaBrowser.Installer
}
catch (Exception e)
{
SystemClose("Error Removing Archive - " + e.GetType().FullName + "\n\n" + e.Message);
return;
}
@ -399,17 +398,12 @@ namespace MediaBrowser.Installer
protected void ExtractPackage(string archive)
{
// Delete old content of system
var systemDir = Path.Combine(RootPath, "system");
var systemDir = Path.Combine(RootPath, "System");
var backupDir = Path.Combine(RootPath, "System.old");
if (Directory.Exists(systemDir))
{
try
{
Directory.Delete(systemDir, true);
}
catch
{
// we tried...
}
if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true);
Directory.Move(systemDir, backupDir);
}
// And extract
@ -437,6 +431,10 @@ namespace MediaBrowser.Installer
}
else
{
//Rollback
if (Directory.Exists(systemDir)) Directory.Delete(systemDir);
Directory.Move(backupDir, systemDir);
File.Delete(archive); // so we don't try again if its an update
throw;
}
}