Canary 0.0.138 Support
app.asar extracts to resources/app, not resources/app/app. Fixed pathing for index.js to check both locations and display error if not found rather than crashing. Also added splice file detection, errors out instead of crashes.
This commit is contained in:
parent
f751f540ec
commit
336152802a
|
@ -180,7 +180,31 @@ namespace BetterDiscordWI.panels {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Splice() {
|
private void Splice() {
|
||||||
string indexloc = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
|
|
||||||
|
string indexloc = null;
|
||||||
|
if(File.Exists($"{GetParent().DiscordPath}\\resources\\app\\app\\index.js"))
|
||||||
|
{
|
||||||
|
//Normal path
|
||||||
|
indexloc = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
|
||||||
|
} else if (File.Exists($"{GetParent().DiscordPath}\\resources\\app\\index.js"))
|
||||||
|
{
|
||||||
|
//Canary 0.0.138 changed path to app\\index.js
|
||||||
|
indexloc = $"{GetParent().DiscordPath}\\resources\\app\\index.js";
|
||||||
|
}
|
||||||
|
|
||||||
|
if(indexloc == null)
|
||||||
|
{
|
||||||
|
AppendLog($"Error: index.js not found");
|
||||||
|
Finalize(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!File.Exists(@"splice"))
|
||||||
|
{
|
||||||
|
AppendLog($"Error: splice install file not found, this should be included with the installer.");
|
||||||
|
Finalize(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Thread t = new Thread(() => {
|
Thread t = new Thread(() => {
|
||||||
List<string> lines = new List<string>();
|
List<string> lines = new List<string>();
|
||||||
|
@ -216,9 +240,10 @@ namespace BetterDiscordWI.panels {
|
||||||
int errors = 0;
|
int errors = 0;
|
||||||
|
|
||||||
string curPath = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
|
string curPath = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
|
||||||
|
string curPath2 = $"{GetParent().DiscordPath}\\resources\\app\\index.js";
|
||||||
if(!File.Exists(curPath)) {
|
if (!File.Exists(curPath) && !File.Exists(curPath2))
|
||||||
AppendLog($"ERROR: FILE: {curPath} DOES NOT EXIST!");
|
{
|
||||||
|
AppendLog($"ERROR: index.js not found in {curPath} or {curPath2}");
|
||||||
errors++;
|
errors++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue