Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/public/utils.js b/public/utils.js 2index c5963e41..30f72965 100644 3--- a/public/utils.js 4+++ b/public/utils.js 5@@ -17,7 +17,7 @@ const osShortName = (function () { 6 7 export function iconsPath() { 8 if (!app.isPackaged) { 9- return path.join(__dirname, "..", "resources", osShortName, "icons"); 10+ return path.join(__dirname, "..", "..", "icons"); 11 } 12 13 return path.join(process.resourcesPath, "icons"); 14@@ -25,47 +25,14 @@ export function iconsPath() { 15 16 export function publicPath() { 17 if (!app.isPackaged) { 18- return path.join(__dirname, "..", "public"); 19+ return path.join(__dirname, "..", "..", "public"); 20 } 21 22 return process.resourcesPath; 23 } 24 25 export function defaultServerBinary() { 26- if (!app.isPackaged) { 27- return { 28- mac: path.join( 29- __dirname, 30- "..", 31- "..", 32- "dist", 33- "kopia_darwin_amd64", 34- "kopia", 35- ), 36- win: path.join( 37- __dirname, 38- "..", 39- "..", 40- "dist", 41- "kopia_windows_amd64", 42- "kopia.exe", 43- ), 44- linux: path.join( 45- __dirname, 46- "..", 47- "..", 48- "dist", 49- "kopia_linux_amd64", 50- "kopia", 51- ), 52- }[osShortName]; 53- } 54- 55- return { 56- mac: path.join(process.resourcesPath, "server", "kopia"), 57- win: path.join(process.resourcesPath, "server", "kopia.exe"), 58- linux: path.join(process.resourcesPath, "server", "kopia"), 59- }[osShortName]; 60+ return "KOPIA"; 61 } 62 export function selectByOS(x) { 63 return x[osShortName];