stdlib: make direnv_layout_dir lazy (#298)

This fixes an issue where the first .envrc fixes the $direnv_layout_dir in combination with source_up or source_env.
direnv · Sep 26, 2017 · 9a2263f · 9a2263f
1 parent 3c92a2c
commit 9a2263f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/stdlib.go b/stdlib.go
@@ -9,7 +9,17 @@ const STDLIB = "#!bash\n" +
 	"\n" +
 	"# Config, change in the direnvrc\n" +
 	"DIRENV_LOG_FORMAT=\"${DIRENV_LOG_FORMAT-direnv: %%s}\"\n" +
-	"direnv_layout_dir=$PWD/.direnv\n" +
+	"\n" +
+	"# Usage: direnv_layout_dir\n" +
+	"#\n" +
+	"# Prints the folder path that direnv should use to store layout content.\n" +
+	"# This defaults to $PWD/.direnv.\n" +
+	"#\n" +
+	"# The reason to use a function is to allow $PWD to change.\n" +
+	"\n" +
+	"direnv_layout_dir() {\n" +
+	"  echo \"${direnv_layout_dir:-$PWD/.direnv}\"\n" +
+	"}\n" +
 	"\n" +
 	"# Usage: log_status [<message> ...]\n" +
 	"#\n" +
@@ -363,7 +373,7 @@ const STDLIB = "#!bash\n" +
 	"# See http://search.cpan.org/dist/local-lib/lib/local/lib.pm for more details\n" +
 	"#\n" +
 	"layout_perl() {\n" +
-	"  local libdir=$direnv_layout_dir/perl5\n" +
+	"  local libdir=$(direnv_layout_dir)/perl5\n" +
 	"  export LOCAL_LIB_DIR=$libdir\n" +
 	"  export PERL_MB_OPT=\"--install_base '$libdir'\"\n" +
 	"  export PERL_MM_OPT=\"INSTALL_BASE=$libdir\"\n" +
@@ -384,7 +394,7 @@ const STDLIB = "#!bash\n" +
 	"layout_python() {\n" +
 	"  local python=${1:-python}\n" +
 	"  [[ $# -gt 0 ]] && shift\n" +
-	"  local old_env=$direnv_layout_dir/virtualenv\n" +
+	"  local old_env=$(direnv_layout_dir)/virtualenv\n" +
 	"  unset PYTHONHOME\n" +
 	"  if [[ -d $old_env && $python = python ]]; then\n" +
 	"    export VIRTUAL_ENV=$old_env\n" +
@@ -396,7 +406,7 @@ const STDLIB = "#!bash\n" +
 	"      return 1\n" +
 	"    fi\n" +
 	"\n" +
-	"    export VIRTUAL_ENV=$direnv_layout_dir/python-$python_version\n" +
+	"    export VIRTUAL_ENV=$(direnv_layout_dir)/python-$python_version\n" +
 	"    if [[ ! -d $VIRTUAL_ENV ]]; then\n" +
 	"      virtualenv \"--python=$python\" \"$@\" \"$VIRTUAL_ENV\"\n" +
 	"    fi\n" +
@@ -422,20 +432,20 @@ const STDLIB = "#!bash\n" +
 	"\n" +
 	"# Usage: layout ruby\n" +
 	"#\n" +
-	"# Sets the GEM_HOME environment variable to \"$direnv_layout_dir/ruby/RUBY_VERSION\".\n" +
+	"# Sets the GEM_HOME environment variable to \"$(direnv_layout_dir)/ruby/RUBY_VERSION\".\n" +
 	"# This forces the installation of any gems into the project's sub-folder.\n" +
 	"# If you're using bundler it will create wrapper programs that can be invoked\n" +
 	"# directly instead of using the $(bundle exec) prefix.\n" +
 	"#\n" +
 	"layout_ruby() {\n" +
 	"  if ruby -e \"exit Gem::VERSION > '2.2.0'\" 2>/dev/null; then\n" +
-	"    export GEM_HOME=$direnv_layout_dir/ruby\n" +
+	"    export GEM_HOME=$(direnv_layout_dir)/ruby\n" +
 	"  else\n" +
 	"    local ruby_version\n" +
 	"    ruby_version=$(ruby -e\"puts (defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby') + '-' + RUBY_VERSION\")\n" +
-	"    export GEM_HOME=$direnv_layout_dir/ruby-${ruby_version}\n" +
+	"    export GEM_HOME=$(direnv_layout_dir)/ruby-${ruby_version}\n" +
 	"  fi\n" +
-	"  export BUNDLE_BIN=$direnv_layout_dir/bin\n" +
+	"  export BUNDLE_BIN=$(direnv_layout_dir)/bin\n" +
 	"\n" +
 	"  PATH_add \"$GEM_HOME/bin\"\n" +
 	"  PATH_add \"$BUNDLE_BIN\"\n" +

diff --git a/stdlib.sh b/stdlib.sh
@@ -7,7 +7,17 @@ direnv="%s"
 
 # Config, change in the direnvrc
 DIRENV_LOG_FORMAT="${DIRENV_LOG_FORMAT-direnv: %%s}"
-direnv_layout_dir=$PWD/.direnv
+
+# Usage: direnv_layout_dir
+#
+# Prints the folder path that direnv should use to store layout content.
+# This needs to be a function as $PWD might change during source_env/up.
+#
+# The output defaults to $PWD/.direnv.
+
+direnv_layout_dir() {
+  echo "${direnv_layout_dir:-$PWD/.direnv}"
+}
 
 # Usage: log_status [<message> ...]
 #
@@ -361,7 +371,7 @@ layout_node() {
 # See http://search.cpan.org/dist/local-lib/lib/local/lib.pm for more details
 #
 layout_perl() {
-  local libdir=$direnv_layout_dir/perl5
+  local libdir=$(direnv_layout_dir)/perl5
   export LOCAL_LIB_DIR=$libdir
   export PERL_MB_OPT="--install_base '$libdir'"
   export PERL_MM_OPT="INSTALL_BASE=$libdir"
@@ -382,7 +392,7 @@ layout_perl() {
 layout_python() {
   local python=${1:-python}
   [[ $# -gt 0 ]] && shift
-  local old_env=$direnv_layout_dir/virtualenv
+  local old_env=$(direnv_layout_dir)/virtualenv
   unset PYTHONHOME
   if [[ -d $old_env && $python = python ]]; then
     export VIRTUAL_ENV=$old_env
@@ -394,7 +404,7 @@ layout_python() {
       return 1
     fi
 
-    export VIRTUAL_ENV=$direnv_layout_dir/python-$python_version
+    export VIRTUAL_ENV=$(direnv_layout_dir)/python-$python_version
     if [[ ! -d $VIRTUAL_ENV ]]; then
       virtualenv "--python=$python" "$@" "$VIRTUAL_ENV"
     fi
@@ -420,20 +430,20 @@ layout_python3() {
 
 # Usage: layout ruby
 #
-# Sets the GEM_HOME environment variable to "$direnv_layout_dir/ruby/RUBY_VERSION".
+# Sets the GEM_HOME environment variable to "$(direnv_layout_dir)/ruby/RUBY_VERSION".
 # This forces the installation of any gems into the project's sub-folder.
 # If you're using bundler it will create wrapper programs that can be invoked
 # directly instead of using the $(bundle exec) prefix.
 #
 layout_ruby() {
   if ruby -e "exit Gem::VERSION > '2.2.0'" 2>/dev/null; then
-    export GEM_HOME=$direnv_layout_dir/ruby
+    export GEM_HOME=$(direnv_layout_dir)/ruby
   else
     local ruby_version
     ruby_version=$(ruby -e"puts (defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby') + '-' + RUBY_VERSION")
-    export GEM_HOME=$direnv_layout_dir/ruby-${ruby_version}
+    export GEM_HOME=$(direnv_layout_dir)/ruby-${ruby_version}
   fi
-  export BUNDLE_BIN=$direnv_layout_dir/bin
+  export BUNDLE_BIN=$(direnv_layout_dir)/bin
 
   PATH_add "$GEM_HOME/bin"
   PATH_add "$BUNDLE_BIN"