Added some command line parameters

NodeInstaller/index.js

@@ -16,13 +16,28 @@ var _appArchive = "/app.asar";
 var _packageJson = _appFolder + "/package.json";
 var _index = _appFolder + "/app/index.js";
 
+var _force = false;
+
+// Get Arguments
+process.argv.forEach(function (val, index, array) {
+    if (val == "--force") {
+        _force = true;
+    }
+
+    if (val == "-d" || val == "--directory") {
+        _discordPath = array[(index+1)]
+    }
+});
+
 function install() {
 
+    if (typeof _discordPath == 'undefined') {
         var _os = process.platform;
         if (_os == "win32") {
            _discordPath = process.env.LOCALAPPDATA + "/Discord/app-"+dver+"/resources";
         } else if (_os == "darwin") {
-        _discordPath = "/Applications/Discord.app/Contents/Resources/" // currently hardcoded to look in the Applications directory, will fix
+            _discordPath = "/Applications/Discord.app/Contents/Resources" // Defaults to Applications directory
+        }
     }
     console.log("Looking for discord resources at: " + _discordPath);
 
@@ -112,6 +127,7 @@ function init() {
 
     var rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 
+    if (_force == false) {
         rl.question("The following directories will be deleted if they exists: discorpath/app, discordpath/node_modules/BetterDiscord, is this ok? Y/N", function(answer) {
 
             var alc = answer.toLowerCase();
@@ -131,6 +147,9 @@ function init() {
                     break;
             }
         });
+    } else {
+        install();
+    }
 }
 
 init();

lib/BetterDiscord.js

@@ -19,7 +19,6 @@ var _mainWindow;
 var _updater;
 var _hash;
 
-
 var _userDefault = {"cache": null};
 var _userConfig = {"cache": null};
 var _cacheExpired = false;

sync.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+git fetch upstream
+git checkout master
+git merge upstream/master
+git push
+