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

isSnap -> isSnapPackage

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-09-12 10:54:49 -04:00
parent 83334fe5bf
commit 8a291cde9e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/vars/is-snap.global-override-for-injectable.ts → src/common/vars/is-snap-package.global-override-for-injectable.ts
View File

@ -4,6 +4,6 @@
*/ */
import { getGlobalOverride } from "../test-utils/get-global-override"; import { getGlobalOverride } from "../test-utils/get-global-override";
import isSnapInjectable from "./is-snap.injectable"; import isSnapPackageInjectable from "./is-snap-package.injectable";
export default getGlobalOverride(isSnapInjectable, () => false); export default getGlobalOverride(isSnapPackageInjectable, () => false);

4
src/common/vars/is-snap.injectable.ts → src/common/vars/is-snap-package.injectable.ts
View File

@ -4,10 +4,10 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
const isSnapInjectable = getInjectable({ const isSnapPackageInjectable = getInjectable({
id: "is-snap", id: "is-snap",
instantiate: () => Boolean(process.env.SNAP), instantiate: () => Boolean(process.env.SNAP),
causesSideEffects: true, causesSideEffects: true,
}); });
export default isSnapInjectable; export default isSnapPackageInjectable;

4
src/extensions/common-api/app.ts
View File

@ -6,7 +6,7 @@
import appNameInjectable from "../../common/vars/app-name.injectable"; import appNameInjectable from "../../common/vars/app-name.injectable";
import isLinuxInjectable from "../../common/vars/is-linux.injectable"; import isLinuxInjectable from "../../common/vars/is-linux.injectable";
import isMacInjectable from "../../common/vars/is-mac.injectable"; import isMacInjectable from "../../common/vars/is-mac.injectable";
import isSnapInjectable from "../../common/vars/is-snap.injectable"; import isSnapPackageInjectable from "../../common/vars/is-snap-package.injectable";
import isWindowsInjectable from "../../common/vars/is-windows.injectable"; import isWindowsInjectable from "../../common/vars/is-windows.injectable";
import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
@ -31,7 +31,7 @@ const App = {
get isSnap() { get isSnap() {
const di = getLegacyGlobalDiForExtensionApi(); const di = getLegacyGlobalDiForExtensionApi();
return di.inject(isSnapInjectable); return di.inject(isSnapPackageInjectable);
}, },
get isWindows() { get isWindows() {
const di = getLegacyGlobalDiForExtensionApi(); const di = getLegacyGlobalDiForExtensionApi();

6
src/main/start-main-application/runnables/setup-shell.injectable.ts
View File

@ -8,7 +8,7 @@ import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of
import { shellEnv } from "../../utils/shell-env"; import { shellEnv } from "../../utils/shell-env";
import os from "os"; import os from "os";
import { unionPATHs } from "../../../common/utils/union-env-path"; import { unionPATHs } from "../../../common/utils/union-env-path";
import isSnapInjectable from "../../../common/vars/is-snap.injectable"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";
import electronAppInjectable from "../../electron-app/electron-app.injectable"; import electronAppInjectable from "../../electron-app/electron-app.injectable";
const setupShellInjectable = getInjectable({ const setupShellInjectable = getInjectable({
@ -16,7 +16,7 @@ const setupShellInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
const logger = di.inject(loggerInjectable); const logger = di.inject(loggerInjectable);
const isSnap = di.inject(isSnapInjectable); const isSnapPackage = di.inject(isSnapPackageInjectable);
const electronApp = di.inject(electronAppInjectable); const electronApp = di.inject(electronAppInjectable);
return { return {
@ -32,7 +32,7 @@ const setupShellInjectable = getInjectable({
env.LANG += ".UTF-8"; env.LANG += ".UTF-8";
} }
if (!isSnap) { if (!isSnapPackage) {
// Prefer the synced PATH over the initial one // Prefer the synced PATH over the initial one
process.env.PATH = unionPATHs(env.PATH ?? "", process.env.PATH ?? ""); process.env.PATH = unionPATHs(env.PATH ?? "", process.env.PATH ?? "");
} }