extern/ohmyzsh
1
0
Fork 1
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-21 23:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(last-working-dir): save working directory more strictly (#11343)

Browse Source 
Fixes #11343
This commit is contained in:
Marc Cornellà 2024-10-27 15:51:38 +01:00
parent 45516ca1d8
commit 68d189cb35
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/last-working-dir/last-working-dir.plugin.zsh
View File

@ -9,20 +9,23 @@ chpwd_last_working_dir() {
[[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0 [[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0
# Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}" local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
builtin pwd >| "$cache_file" 'builtin' 'echo' '-E' "$PWD" >| "$cache_file"
} }
# Changes directory to the last working directory # Changes directory to the last working directory
lwd() { lwd() {
# Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}" local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
[[ -r "$cache_file" ]] && cd "$(cat "$cache_file")" [[ -r "$cache_file" ]] && cd "$(<"$cache_file")"
} }
# Jump to last directory automatically unless: # Jump to last directory automatically unless:
# - this isn't the first time the plugin is loaded #
# - it's not in $HOME directory # - This isn't the first time the plugin is loaded
[[ -n "$ZSH_LAST_WORKING_DIRECTORY" ]] && return # - We're not in the $HOME directory (e.g. if terminal opened a different folder)
[[ "$PWD" != "$HOME" ]] && return [[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]] || return
[[ "$PWD" == "$HOME" ]] || return
lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true if lwd 2>/dev/null; then
ZSH_LAST_WORKING_DIRECTORY=1
fi