lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Merge pull request #189 from jzanutto/master 

Fixed OSX installer issues
This commit is contained in:
Jiiks 2016-02-14 03:26:30 +02:00
parent 4cab5e6067 6f3026fff5
commit 9dcf8ff17e
1 changed files with 120 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
NodeInstaller/index.js Normal file → Executable file
View File

@ -38,14 +38,14 @@ function install() {
if (typeof _discordPath == 'undefined') { if (typeof _discordPath == 'undefined') {
var _os = process.platform; var _os = process.platform;
if (_os == "win32") { if (_os == "win32") {
_importSplice = 89; _importSplice = 89;
_functionCallSplice = 497; _functionCallSplice = 497;
_functionSplice = 601; _functionSplice = 601;
_discordPath = process.env.LOCALAPPDATA + "/Discord/app-"+dver+"/resources"; _discordPath = process.env.LOCALAPPDATA + "/Discord/app-"+dver+"/resources";
} else if (_os == "darwin") { } else if (_os == "darwin") {
_importSplice = 67; _importSplice = 67;
_functionCallSplice = 446; _functionCallSplice = 446;
_functionSplice = 547; _functionSplice = 547;
_discordPath = "/Applications/Discord.app/Contents/Resources" // Defaults to Applications directory _discordPath = "/Applications/Discord.app/Contents/Resources" // Defaults to Applications directory
} }
} }
@ -68,12 +68,6 @@ function install() {
console.log("Deleted " + _discordPath + "/node_modules/BetterDiscord" + " folder."); console.log("Deleted " + _discordPath + "/node_modules/BetterDiscord" + " folder.");
} }
console.log("Copying BetterDiscord");
fs.mkdirSync(_discordPath + "/node_modules/BetterDiscord");
wrench.copyDirSyncRecursive(__dirname + "/BetterDiscord/", _discordPath + "/node_modules/BetterDiscord/", {forceDelete: true});
console.log("Looking for app archive"); console.log("Looking for app archive");
if(fs.existsSync(_discordPath + _appArchive)) { if(fs.existsSync(_discordPath + _appArchive)) {
console.log("App archive found at: " + _discordPath + _appArchive); console.log("App archive found at: " + _discordPath + _appArchive);
@ -83,110 +77,132 @@ function install() {
} }
console.log("Extracting app archive"); console.log("Extracting app archive");
asar.extractAll(_discordPath + _appArchive, _discordPath + _appFolder); asar.extractAll(_discordPath + _appArchive, _discordPath + _appFolder);
console.log("Copying BetterDiscord");
fs.mkdirSync(_discordPath + "/node_modules/BetterDiscord");
wrench.copyDirSyncRecursive(__dirname + "/BetterDiscord/", _discordPath + _appFolder + "/node_modules/BetterDiscord/", {forceDelete: true});
if(!fs.existsSync("splice")) { if(!fs.existsSync("splice")) {
console.log("Missing splice file"); console.log("Missing splice file");
process.exit(); process.exit();
} }
var splice = fs.readFileSync("splice"); var splice = fs.readFileSync("splice");
fs.exists(_discordPath + _appFolder, function(exists) {
if(exists) {
console.log("Extracted to: " + _discordPath + _appFolder);
console.log("Injecting index.js");
var data = fs.readFileSync(_discordPath + _index).toString().split("\n"); fs.exists(_discordPath + _appFolder, function(exists) {
data.splice(_importSplice, 0, 'var _betterDiscord = require(\'betterdiscord\');\n'); if(exists) {
data.splice(_functionCallSplice, 0, splice); console.log("Extracted to: " + _discordPath + _appFolder);
console.log("Injecting index.js");
fs.writeFile(_discordPath + _index, data.join("\n"), function(err) { var data = fs.readFileSync(_discordPath + _index).toString().split("\n");
if(err) return console.log(err); data.splice(_importSplice, 0, 'var _betterDiscord = require(\'betterdiscord\');\n');
console.log("Injected index.js"); data.splice(_functionCallSplice, 0, splice);
console.log("Deleting old cache files");
var counter = 0;
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_twitch_global.json', (exists) => {
console.log("Deleting emotes_twitch_global.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_twitch_global.json', (err) => {
if(err) throw err;
console.log("Deleted emotes_twitch_global.json");
counter++;
finished();
});
});
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_twitch_subscriber.json', (exists) => {
console.log("Deleting emotes_twitch_subscriber.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_twitch_subscriber.json', (err) => {
if(err) throw err;
console.log("Deleted emotes_twitch_subscriber.json");
counter++;
finished();
});
});
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_bttv.json', (exists) => {
console.log("Deleting emotes_bttv.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_bttv.json', (err) => {
if(err) throw err;
console.log("Deleted emotes_bttv.json");
counter++;
finished();
});
});
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_bttv_2.json', (exists) => {
console.log("Deleting emotes_bttv_2.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_bttv_2.json', (err) => {
if(err) throw err;
console.log("Deleted emotes_bttv_2.json");
counter++;
finished();
});
});
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_ffz.json', (exists) => {
console.log("Deleting emotes_ffz.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/emotes_ffz.json', (err) => {
if(err) throw err;
console.log("Deleted emotes_ffz.json");
counter++;
finished();
});
});
fs.exists(process.env.HOME + '/Library/Preferences/BetterDiscord/user.json', (exists) => {
console.log("Deleting user.json")
fs.unlink(process.env.HOME + '/Library/Preferences/BetterDiscord/user.json', (err) => {
if(err) throw err;
console.log("Deleted user.json");
counter++;
finished();
});
});
function finished() {
if(counter => 6) {
console.log("Looks like we're done here");
process.exit();
}
}
});
} else { fs.writeFile(_discordPath + _index, data.join("\n"), function(err) {
console.log("Something went wrong, rerun."); if(err) return console.log(err);
process.exit(); console.log("Injected index.js");
}
}); console.log("Deleting old cache files");
var counter = 0;
var _prefsPath = '/Library/Preferences/BetterDiscord/';
var emotes_twitch_global = 'emotes_twitch_global.json';
fs.exists(process.env.HOME + _prefsPath + emotes_twitch_global, (exists) => {
if (exists) {
console.log("Deleting " + emotes_twitch_global);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_twitch_global, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_twitch_global);
}
counter++;
finished();
});
var emotes_twitch_subscriber = 'emotes_twitch_subscriber.json';
fs.exists(process.env.HOME + _prefsPath + emotes_twitch_subscriber, (exists) => {
if (exists) {
console.log("Deleting " + emotes_twitch_subscriber);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_twitch_subscriber, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_twitch_subscriber);
}
counter++;
finished();
});
var emotes_bttv = 'emotes_bttv.json';
fs.exists(process.env.HOME + _prefsPath + emotes_bttv, (exists) => {
if (exists) {
console.log("Deleting " + emotes_bttv);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_bttv, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_bttv);
}
counter++;
finished();
});
var emotes_bttv_2 = "emotes_bttv_2.json";
fs.exists(process.env.HOME + _prefsPath + emotes_bttv_2, (exists) => {
if (exists) {
console.log("Deleting " + emotes_bttv_2);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_bttv_2, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_bttv_2);
}
counter++;
finished();
});
var emotes_ffz = "emotes_ffz.json";
fs.exists(process.env.HOME + _prefsPath + emotes_ffz, (exists) => {
if (exists) {
console.log("Deleting " + emotes_ffz);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_ffz, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_ffz);
}
counter++;
finished();
});
var user_pref = "user.json";
fs.exists(process.env.HOME + _prefsPath + user_pref, (exists) => {
if (exists) {
console.log("Deleting " + user_pref);
fs.unlinkSync(process.env.HOME + _prefsPath + user_pref, (err) => {
if(err) throw err;
});
console.log("Deleted " + user_pref);
}
counter++;
finished();
});
function finished() {
if(counter => 6) {
console.log("Looks like we're done here");
process.exit();
}
}
});
} else {
console.log("Something went wrong. Please try again.");
process.exit();
}
});
} else { } else {
console.log("Discord resources not found at: " + _discordPath); console.log("Discord resources not found at: " + _discordPath);