From 5a4e121e2b6dddba16ed53fd4427f6d817939ea9 Mon Sep 17 00:00:00 2001 From: noodlebox Date: Wed, 18 Jan 2017 03:40:01 -0600 Subject: [PATCH 1/5] Fix missing value for OSX --- Installers/Electron/src/utils.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Installers/Electron/src/utils.js b/Installers/Electron/src/utils.js index e08e95e..727baa9 100644 --- a/Installers/Electron/src/utils.js +++ b/Installers/Electron/src/utils.js @@ -84,6 +84,9 @@ class Utils { "win32": () => { return `${process.env.APPDATA}/BetterDiscord/lib`; }, + "darwin": () => { + return ""; // TODO + }, "linux": () => { return ""; // TODO } From 43aae6ac72a9c55ddf8451b9d31ff134c05bb986 Mon Sep 17 00:00:00 2001 From: noodlebox Date: Wed, 18 Jan 2017 04:12:35 -0600 Subject: [PATCH 2/5] Fix default Discord path for OSX --- Installers/Electron/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installers/Electron/src/utils.js b/Installers/Electron/src/utils.js index 727baa9..36ec3f3 100644 --- a/Installers/Electron/src/utils.js +++ b/Installers/Electron/src/utils.js @@ -73,7 +73,7 @@ class Utils { }); return path; }, - "darwin": () => "/Applications/Discord.app", + "darwin": () => "/Applications/Discord.app/Contents", "linux": () => "" // TODO }[platform](); From 3431d30ac2d570281525c121fe3ee518f477b26e Mon Sep 17 00:00:00 2001 From: noodlebox Date: Wed, 25 Jan 2017 23:04:28 -0600 Subject: [PATCH 3/5] Add default install path for OSX --- Installers/Electron/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installers/Electron/src/utils.js b/Installers/Electron/src/utils.js index 36ec3f3..1418112 100644 --- a/Installers/Electron/src/utils.js +++ b/Installers/Electron/src/utils.js @@ -85,7 +85,7 @@ class Utils { return `${process.env.APPDATA}/BetterDiscord/lib`; }, "darwin": () => { - return ""; // TODO + return `${process.env.HOME}/.local/share/BetterDiscord`; }, "linux": () => { return ""; // TODO From b6bdaedb6d5ea509e283e2245ff7835aafe4e852 Mon Sep 17 00:00:00 2001 From: noodlebox Date: Thu, 26 Jan 2017 00:24:52 -0600 Subject: [PATCH 4/5] Add sane default paths for Linux --- Installers/Electron/src/utils.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Installers/Electron/src/utils.js b/Installers/Electron/src/utils.js index 1418112..b05d2bb 100644 --- a/Installers/Electron/src/utils.js +++ b/Installers/Electron/src/utils.js @@ -74,7 +74,7 @@ class Utils { return path; }, "darwin": () => "/Applications/Discord.app/Contents", - "linux": () => "" // TODO + "linux": () => "/usr/share/discord-canary" }[platform](); } @@ -88,7 +88,8 @@ class Utils { return `${process.env.HOME}/.local/share/BetterDiscord`; }, "linux": () => { - return ""; // TODO + // FIXME: for a non-root user, a path like OSX's makes more sense + return "/usr/local/share/BetterDiscord"; } }[platform](); } From e793920ed9b35dc09371b6f739a275e4db02ebf5 Mon Sep 17 00:00:00 2001 From: noodlebox Date: Thu, 26 Jan 2017 18:03:52 -0600 Subject: [PATCH 5/5] Use path for stable release as Linux default --- Installers/Electron/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installers/Electron/src/utils.js b/Installers/Electron/src/utils.js index b05d2bb..ec5e958 100644 --- a/Installers/Electron/src/utils.js +++ b/Installers/Electron/src/utils.js @@ -74,7 +74,7 @@ class Utils { return path; }, "darwin": () => "/Applications/Discord.app/Contents", - "linux": () => "/usr/share/discord-canary" + "linux": () => "/usr/share/discord" }[platform](); }