source_env: show full path

direnv · Apr 6, 2022 · 64bb34c · 64bb34c
1 parent a446746
commit 64bb34c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/stdlib.sh b/stdlib.sh
@@ -346,7 +346,7 @@ source_env() {
   pushd "$(pwd 2>/dev/null)" >/dev/null || return 1
   pushd "$rcpath_dir" >/dev/null || return 1
   if [[ -f ./$rcpath_base ]]; then
-    log_status "loading $rcfile"
+    log_status "loading $(user_rel_path "$(expand_path "$rcpath")")"
     # shellcheck disable=SC1090
     . "./$rcpath_base"
   else

diff --git a/test/stdlib.bash b/test/stdlib.bash
@@ -190,6 +190,11 @@ test_name source_env_if_exists
   echo "export FOO=bar" > existing_file
   source_env_if_exists existing_file
   [[ $FOO = bar ]]
+
+  # Expect correct path being logged
+  export HOME=$workdir
+  output="$(source_env_if_exists existing_file 2>&1 > /dev/null)"
+  [[ "${output#*'loading ~/existing_file'}" != "$output" ]]
 )
 
 test_name env_vars_required