Merge pull request #189 from jzanutto/master
Fixed OSX installer issues
This commit is contained in:
commit
9dcf8ff17e
|
@ -68,12 +68,6 @@ function install() {
|
|||
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");
|
||||
if(fs.existsSync(_discordPath + _appArchive)) {
|
||||
console.log("App archive found at: " + _discordPath + _appArchive);
|
||||
|
@ -83,10 +77,14 @@ function install() {
|
|||
}
|
||||
|
||||
console.log("Extracting app archive");
|
||||
|
||||
|
||||
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")) {
|
||||
console.log("Missing splice file");
|
||||
process.exit();
|
||||
|
@ -111,66 +109,86 @@ function install() {
|
|||
console.log("Deleting old cache files");
|
||||
|
||||
var counter = 0;
|
||||
var _prefsPath = '/Library/Preferences/BetterDiscord/';
|
||||
|
||||
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) => {
|
||||
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.json");
|
||||
});
|
||||
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();
|
||||
});
|
||||
});
|
||||
|
||||
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) => {
|
||||
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_twitch_subscriber.json");
|
||||
});
|
||||
console.log("Deleted " + emotes_bttv);
|
||||
}
|
||||
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) => {
|
||||
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.json");
|
||||
});
|
||||
console.log("Deleted " + emotes_bttv_2);
|
||||
}
|
||||
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) => {
|
||||
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_bttv_2.json");
|
||||
});
|
||||
console.log("Deleted " + emotes_ffz);
|
||||
}
|
||||
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) => {
|
||||
});
|
||||
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 emotes_ffz.json");
|
||||
});
|
||||
console.log("Deleted " + user_pref);
|
||||
}
|
||||
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) {
|
||||
|
@ -178,12 +196,10 @@ function install() {
|
|||
process.exit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
} else {
|
||||
console.log("Something went wrong, rerun.");
|
||||
console.log("Something went wrong. Please try again.");
|
||||
process.exit();
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue