Fix being loaded from a function (antigen)

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index 1211f9c2ba43a181b503e4be4fbd930e61208c9b..14c4a7a2e114277d0e23eb88e56165047e7c0c9b 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -2,6 +2,7 @@
 # https://github.com/joshuaclayton/dotfiles/blob/master/zsh_profile.d/autoenv.zsh
 
 export AUTOENV_ENV_FILENAME=$HOME/.env_auth
+[ -e $AUTOENV_ENV_FILENAME ] || touch $AUTOENV_ENV_FILENAME
 
 # Name of file to look for when entering directories.
 : ${AUTOENV_FILE_ENTER:=.env}
@@ -41,19 +42,21 @@ autoenv_source_parent() {
 
 # Internal functions. {{{
 # Internal: stack of entered (and handled) directories. {{{
+typeset -g -a _autoenv_stack_entered
 _autoenv_stack_entered=()
-typeset -A _autoenv_stack_entered_mtime
+# -g: make it global, this is required when used with antigen.
+typeset -g -A _autoenv_stack_entered_mtime
 _autoenv_stack_entered_mtime=()
 
 # Add an entry to the stack, and remember its mtime.
 _autoenv_stack_entered_add() {
   local env_file=$1
 
-  _autoenv_debug "[stack] adding: $env_file" 2
-
   # Remove any existing entry.
   _autoenv_stack_entered_remove $env_file
 
+  _autoenv_debug "[stack] adding: $env_file" 2
+
   # Append it to the stack, and remember its mtime.
   _autoenv_stack_entered+=($env_file)
   _autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file)
@@ -97,7 +100,7 @@ _autoenv_debug() {
     return
   fi
   # Load zsh color support.
-  if [[ -z $colors ]]; then
+  if [[ -z $color ]]; then
     autoload colors
     colors
   fi
@@ -122,15 +125,19 @@ _autoenv_debug() {
 zmodload -F zsh/stat b:zstat
 
 
+# Generate hash pair for a given file ($1).
+# A fixed hash value can be given as 2nd arg, but is used with tests only.
 _autoenv_hash_pair() {
   local env_file=${1:A}
-  local env_shasum
-  if [[ -n $2 ]]; then
-    env_shasum=$2
-  else
+  local env_shasum=${2:-}
+  if [[ -z $env_shasum ]]; then
+    if ! [[ -e $env_file ]]; then
+      echo "Missing file argument for _autoenv_hash_pair!" >&2
+      return 1
+    fi
     env_shasum=$(shasum $env_file | cut -d' ' -f1)
   fi
-  echo "$env_file:$env_shasum:1"
+  echo ":${env_file}:${env_shasum}:1"
 }
 
 _autoenv_authorized_env_file() {
@@ -141,15 +148,18 @@ _autoenv_authorized_env_file() {
 }
 
 _autoenv_authorize() {
-  local env_file=$1
+  local env_file=${1:A}
   _autoenv_deauthorize $env_file
-  _autoenv_hash_pair $env_file >> $AUTOENV_ENV_FILENAME
+  _autoenv_hash_pair $env_file >>| $AUTOENV_ENV_FILENAME
 }
 
+# Deauthorize a given filename, by removing it from the auth file.
+# This uses `test -s` to only handle non-empty files, and a subshell to
+# allow for writing to the same file again.
 _autoenv_deauthorize() {
-  local env_file=$1
-  if [[ -f $AUTOENV_ENV_FILENAME ]]; then
-    echo $(\grep -vF $env_file $AUTOENV_ENV_FILENAME) > $AUTOENV_ENV_FILENAME
+  local env_file=${1:A}
+  if [[ -s $AUTOENV_ENV_FILENAME ]]; then
+    echo "$(\grep -vF :${env_file}: $AUTOENV_ENV_FILENAME)" >| $AUTOENV_ENV_FILENAME
   fi
 }
 
@@ -195,11 +205,11 @@ _autoenv_source_dir=${0:A:h}
 
 _autoenv_source() {
   local env_file=$1
-  _autoenv_event=$2
+  autoenv_event=$2
   local _autoenv_envfile_dir=${3:-${1:A:h}}
 
-  _autoenv_from_dir=$_autoenv_chpwd_prev_dir
-  _autoenv_to_dir=$PWD
+  autoenv_from_dir=$_autoenv_chpwd_prev_dir
+  autoenv_to_dir=$PWD
 
   # Source varstash library once.
   if [[ -z "$functions[(I)autostash]" ]]; then
@@ -211,7 +221,7 @@ _autoenv_source() {
   # Change to directory of env file, source it and cd back.
   local new_dir=$PWD
   builtin cd -q $_autoenv_envfile_dir
-  _autoenv_debug "== SOURCE: ${bold_color}$env_file${reset_color}\n      PWD: $PWD"
+  _autoenv_debug "== SOURCE: ${bold_color:-}$env_file${reset_color:-}\n      PWD: $PWD"
   (( _autoenv_debug_indent++ ))
   source $env_file
   (( _autoenv_debug_indent-- ))
@@ -221,7 +231,7 @@ _autoenv_source() {
   # Unset vars set for enter/leave scripts.
   # This should not get done for recursion (via autoenv_source_parent),
   # and can be useful to have in general after autoenv was used.
-  # unset _autoenv_event _autoenv_from_dir _autoenv_to_dir
+  # unset autoenv_event autoenv_from_dir autoenv_to_dir
 }
 
 _autoenv_get_file_upwards() {
@@ -266,6 +276,10 @@ _autoenv_chpwd_handler() {
         if _autoenv_check_authorized_env_file $env_file_leave; then
           _autoenv_source $env_file_leave leave $prev_dir
         fi
+
+        # Unstash any autostashed stuff.
+        varstash_dir=$prev_dir autounstash
+
         _autoenv_stack_entered_remove $prev_file
       fi
     done