mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
c11a61e133
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user