@treeport/treeport 0.2.2 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -209,14 +209,15 @@ function integrateShellLaunch(argv, env, root, tmuxExecutable) {
209
209
  }
210
210
  if (shell === "fish") {
211
211
  const integrationDataDir = path.join(root, "fish");
212
+ const fishEnvironment = {
213
+ ...integratedEnv,
214
+ TREEPORT_FISH_XDG_DATA_DIR: integrationDataDir,
215
+ XDG_DATA_DIRS: [integrationDataDir, env.XDG_DATA_DIRS].filter(Boolean).join(":")
216
+ };
217
+ if (env.XDG_DATA_DIRS !== void 0) fishEnvironment.TREEPORT_FISH_XDG_DATA_DIRS_SET = "1";
212
218
  return {
213
219
  argv,
214
- env: {
215
- ...integratedEnv,
216
- TREEPORT_FISH_XDG_DATA_DIR: integrationDataDir,
217
- ...env.XDG_DATA_DIRS !== void 0 ? { TREEPORT_FISH_XDG_DATA_DIRS_SET: "1" } : {},
218
- XDG_DATA_DIRS: [integrationDataDir, env.XDG_DATA_DIRS].filter(Boolean).join(":")
219
- }
220
+ env: fishEnvironment
220
221
  };
221
222
  }
222
223
  positional = false;
@@ -239,17 +240,18 @@ function integrateShellLaunch(argv, env, root, tmuxExecutable) {
239
240
  };
240
241
  }
241
242
  const integrationFile = path.join(root, "bash", "treeport.bash");
243
+ const bashEnvironment = {
244
+ ...integratedEnv,
245
+ TREEPORT_BASH_INTEGRATION_FILE: integrationFile,
246
+ PROMPT_COMMAND: "source \"${TREEPORT_BASH_INTEGRATION_FILE}\""
247
+ };
248
+ if (env.PROMPT_COMMAND !== void 0) {
249
+ bashEnvironment.TREEPORT_BASH_PROMPT_COMMAND_SET = "1";
250
+ bashEnvironment.TREEPORT_BASH_PROMPT_COMMAND = env.PROMPT_COMMAND;
251
+ }
242
252
  return {
243
253
  argv,
244
- env: {
245
- ...integratedEnv,
246
- TREEPORT_BASH_INTEGRATION_FILE: integrationFile,
247
- ...env.PROMPT_COMMAND !== void 0 ? {
248
- TREEPORT_BASH_PROMPT_COMMAND_SET: "1",
249
- TREEPORT_BASH_PROMPT_COMMAND: env.PROMPT_COMMAND
250
- } : {},
251
- PROMPT_COMMAND: "source \"${TREEPORT_BASH_INTEGRATION_FILE}\""
252
- }
254
+ env: bashEnvironment
253
255
  };
254
256
  }
255
257
  //#endregion