Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues 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) catch (Exception e)
{ {
SystemClose("Error Removing Archive - " + e.GetType().FullName + "\n\n" + e.Message); SystemClose("Error Removing Archive - " + e.GetType().FullName + "\n\n" + e.Message);
return; return;
} }
@ -399,17 +398,12 @@ namespace MediaBrowser.Installer
protected void ExtractPackage(string archive) protected void ExtractPackage(string archive)
{ {
// Delete old content of system // 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)) if (Directory.Exists(systemDir))
{ {
try if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true);
{ Directory.Move(systemDir, backupDir);
Directory.Delete(systemDir, true);
}
catch
{
// we tried...
}
} }
// And extract // And extract
@ -437,6 +431,10 @@ namespace MediaBrowser.Installer
} }
else 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; throw;
} }
} }