diff --git a/src/common/vars/is-snap.global-override-for-injectable.ts b/src/common/vars/is-snap-package.global-override-for-injectable.ts similarity index 61% rename from src/common/vars/is-snap.global-override-for-injectable.ts rename to src/common/vars/is-snap-package.global-override-for-injectable.ts index 9707231f42..cb3ff0a6e9 100644 --- a/src/common/vars/is-snap.global-override-for-injectable.ts +++ b/src/common/vars/is-snap-package.global-override-for-injectable.ts @@ -4,6 +4,6 @@ */ 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); diff --git a/src/common/vars/is-snap.injectable.ts b/src/common/vars/is-snap-package.injectable.ts similarity index 77% rename from src/common/vars/is-snap.injectable.ts rename to src/common/vars/is-snap-package.injectable.ts index 9872821e03..a2c545870b 100644 --- a/src/common/vars/is-snap.injectable.ts +++ b/src/common/vars/is-snap-package.injectable.ts @@ -4,10 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -const isSnapInjectable = getInjectable({ +const isSnapPackageInjectable = getInjectable({ id: "is-snap", instantiate: () => Boolean(process.env.SNAP), causesSideEffects: true, }); -export default isSnapInjectable; +export default isSnapPackageInjectable; diff --git a/src/extensions/common-api/app.ts b/src/extensions/common-api/app.ts index b4d15a63e3..2f3dafdc0a 100644 --- a/src/extensions/common-api/app.ts +++ b/src/extensions/common-api/app.ts @@ -6,7 +6,7 @@ import appNameInjectable from "../../common/vars/app-name.injectable"; import isLinuxInjectable from "../../common/vars/is-linux.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 { 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"; @@ -31,7 +31,7 @@ const App = { get isSnap() { const di = getLegacyGlobalDiForExtensionApi(); - return di.inject(isSnapInjectable); + return di.inject(isSnapPackageInjectable); }, get isWindows() { const di = getLegacyGlobalDiForExtensionApi(); diff --git a/src/main/start-main-application/runnables/setup-shell.injectable.ts b/src/main/start-main-application/runnables/setup-shell.injectable.ts index 2bde116306..80800e8073 100644 --- a/src/main/start-main-application/runnables/setup-shell.injectable.ts +++ b/src/main/start-main-application/runnables/setup-shell.injectable.ts @@ -8,7 +8,7 @@ import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of import { shellEnv } from "../../utils/shell-env"; import os from "os"; 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"; const setupShellInjectable = getInjectable({ @@ -16,7 +16,7 @@ const setupShellInjectable = getInjectable({ instantiate: (di) => { const logger = di.inject(loggerInjectable); - const isSnap = di.inject(isSnapInjectable); + const isSnapPackage = di.inject(isSnapPackageInjectable); const electronApp = di.inject(electronAppInjectable); return { @@ -32,7 +32,7 @@ const setupShellInjectable = getInjectable({ env.LANG += ".UTF-8"; } - if (!isSnap) { + if (!isSnapPackage) { // Prefer the synced PATH over the initial one process.env.PATH = unionPATHs(env.PATH ?? "", process.env.PATH ?? ""); }