Changed the sequence of actions.

This commit is contained in:
ivenovalue 2016-02-11 20:00:33 +01:00
parent 95871691a0
commit bf8ab019c6
1 changed files with 18 additions and 19 deletions

View File

@ -138,32 +138,31 @@ namespace BetterDiscordWI.panels {
Thread.Sleep(100); Thread.Sleep(100);
} }
AppendLog("Moving BetterDiscord to resources\\node_modules\\"); AppendLog("Extracting app.asar");
string appAsarPath = GetParent().DiscordPath + "\\resources\\app.asar";
Directory.Move(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord\\temp\\BetterDiscordApp-stable", GetParent().DiscordPath + "\\resources\\node_modules\\BetterDiscord"); if(File.Exists(appAsarPath)) {
AsarArchive archive = new AsarArchive(appAsarPath);
AsarExtractor extractor = new AsarExtractor();
extractor.ExtractAll(archive, GetParent().DiscordPath + "\\resources\\app\\");
} else {
AppendLog("Error: app.asar file couldn't be found in 'resources' folder. Installation cannot Continue.");
errors = 1;
Finalize(errors);
}
try { if(errors == 0) {
AppendLog("Extracting app.asar"); AppendLog("Moving BetterDiscord to resources\\node_modules\\");
string appAsarPath = GetParent().DiscordPath + "\\resources\\app.asar"; Directory.Move(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord\\temp\\BetterDiscordApp-stable", GetParent().DiscordPath + "\\resources\\node_modules\\BetterDiscord");
if(File.Exists(appAsarPath)) {
AsarArchive archive = new AsarArchive(appAsarPath);
AsarExtractor extractor = new AsarExtractor();
//Add extraoffset of 3
extractor.ExtractAll(archive, GetParent().DiscordPath + "\\resources\\app\\");
try {
Splice(); Splice();
} else { } catch {
AppendLog("Error: app.asar file couldn't be found in 'resources' folder. Installation cannot Continue."); AppendLog("Error: Extracting app.asar: Newtonsoft.Json.dll might not be present in the Installer Folder. Installation cannot Continue.");
errors = 1; errors = 1;
Finalize(errors); Finalize(errors);
} }
} catch { }
AppendLog("Error: Extracting app.asar: Newtonsoft.Json.dll might not be present in the Installer Folder. Installation cannot Continue.");
errors = 1;
Finalize(errors);
}
}); });