From: Simon Ruderich Date: Fri, 9 Oct 2015 22:09:52 +0000 (+0200) Subject: zsh/rc: don't load ~/.zsh/env.update if older than reboot X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=8db70f8ce60b4e949e1733c069101c4b7ea468eb;p=config%2Fdotfiles.git zsh/rc: don't load ~/.zsh/env.update if older than reboot --- diff --git a/zsh/rc b/zsh/rc index 3d15d2e..1c7c846 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1079,6 +1079,7 @@ precmd_functions+=(zshrc_restart_precmd) # RELOAD SETTINGS zshenv_reload_time=0 # load before first command +zshenv_boot_time=$(date -d "$(uptime -s)" '+%s') # uptime in epoch seconds # Automatically source ~/.zsh/env.update when the file changes (and exists). # Can be used e.g. to update SSH_AGENT_PID and GPG_AGENT_INFO variables in @@ -1092,6 +1093,11 @@ zshenv_reload_preexec() { if ! zstat -A stat +mtime $file 2>/dev/null; then return fi + # File was modified before reboot. Skip it to prevent loading of old + # values. + if [[ $stat -lt $zshenv_boot_time ]]; then + return + fi # File wasn't modified, nothing to do. if [[ $stat -le $zshenv_reload_time ]]; then return