Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/pixi_pty/src/unix/pty_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl PtySession {
/// forward all input from stdin to the process and all output from the process to stdout.
/// This will block until the process exits.
pub fn interact(&mut self, wait_until: Option<&str>) -> io::Result<Option<i32>> {
let pattern_timeout = Duration::from_secs(1);
let pattern_timeout = Duration::from_secs(3);
let pattern_start = Instant::now();

// Make sure anything we have written so far has been flushed.
Expand Down Expand Up @@ -138,7 +138,7 @@ impl PtySession {
// Check if we have waited long enough for the pattern
if pattern_start.elapsed() > pattern_timeout && !write_stdout {
io::stdout().write_all(
"WARNING: Did not detect successful shell initialization within 1 second.\n\r Please check on https://pixi.sh/advanced/pixi_shell/#issues-with-pixi-shell for more tips.\n\r"
"WARNING: Did not detect successful shell initialization within 1 second.\n\r Please check on https://pixi.sh/latest/advanced/pixi_shell/#issues-with-pixi-shell for more tips.\n\r"
.as_bytes(),
)?;
io::stdout().write_all(&self.rolling_buffer)?;
Expand Down
4 changes: 2 additions & 2 deletions docs/advanced/pixi_shell.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pixi shell

On Unix systems the shell command works by creating a "fake" PTY session that will start the shell, and then send a string like `source /tmp/activation-env-12345.sh` to the `stdin` in order to activate the environment. If you would peek under the hood of the the `shell` command, then you would see that this is the first thing executed in the new shell session.

The temporary script that we generate ends with `echo "PIXI_ENV_ACTIVATED"` which is used to detect if the environment was activated successfully. If we do not receive this string after one second, we will issue a warning to the user.
The temporary script that we generate ends with `echo "PIXI_ENV_ACTIVATED"` which is used to detect if the environment was activated successfully. If we do not receive this string after three seconds, we will issue a warning to the user.

## Issues With Pixi Shell

Expand Down Expand Up @@ -46,7 +46,7 @@ With the `--manifest-path` option you can also specify which environment to acti
function pixi_activate() {
# default to current directory if no path is given
local manifest_path="${1:-.}"
eval "$(pixi shell-hook --manifest-path '$manifest_path')"
eval "$(pixi shell-hook --manifest-path $manifest_path)"
}
```

Expand Down