hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix bugs with paths

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2022-02-24 19:17:16 +02:00
parent d54da4f5ad
commit c0da777f3e
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts
View File

@ -4,16 +4,10 @@
*/ */
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import path from "path"; import path from "path";
import isDevelopmentInjectable from "../../vars/is-development.injectable";
import contextDirInjectable from "../../vars/context-dir.injectable";
import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable"; import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
const directoryForBinariesInjectable = getInjectable({ const directoryForBinariesInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
if (di.inject(isDevelopmentInjectable)) {
return path.join(di.inject(contextDirInjectable), "binaries");
}
return path.join(di.inject(directoryForUserDataInjectable), "binaries"); return path.join(di.inject(directoryForUserDataInjectable), "binaries");
}, },
lifecycle: lifecycleEnum.singleton, lifecycle: lifecycleEnum.singleton,

21
src/common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable.ts Normal file
View File

@ -0,0 +1,21 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import path from "path";
import isDevelopmentInjectable from "../../vars/is-development.injectable";
import contextDirInjectable from "../../vars/context-dir.injectable";
const directoryForBundledBinariesInjectable = getInjectable({
instantiate: (di) => {
if (di.inject(isDevelopmentInjectable)) {
return path.join(di.inject(contextDirInjectable), "binaries");
}
return path.join(process.resourcesPath);
},
lifecycle: lifecycleEnum.singleton,
});
export default directoryForBundledBinariesInjectable;

4
src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
View File

@ -5,16 +5,16 @@
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import { KubeAuthProxy } from "./kube-auth-proxy"; import { KubeAuthProxy } from "./kube-auth-proxy";
import type { Cluster } from "../../common/cluster/cluster"; import type { Cluster } from "../../common/cluster/cluster";
import directoryForBinariesInjectable from "../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable";
import path from "path"; import path from "path";
import { isDevelopment, isWindows } from "../../common/vars"; import { isDevelopment, isWindows } from "../../common/vars";
import directoryForBundledBinariesInjectable from "../../common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable";
const createKubeAuthProxyInjectable = getInjectable({ const createKubeAuthProxyInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
const binaryName = isWindows ? "lens-k8s-proxy.exe" : "lens-k8s-proxy"; const binaryName = isWindows ? "lens-k8s-proxy.exe" : "lens-k8s-proxy";
const proxyPath = isDevelopment ? path.join("client", process.platform, process.arch) : process.arch; const proxyPath = isDevelopment ? path.join("client", process.platform, process.arch) : process.arch;
const dependencies = { const dependencies = {
proxyBinPath: path.join(di.inject(directoryForBinariesInjectable), proxyPath, binaryName), proxyBinPath: path.join(di.inject(directoryForBundledBinariesInjectable), proxyPath, binaryName),
}; };
return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) =>