Merge branch 'master' of github.com:johnmcdonnell/prezto

12 years ago · 1ae80d0f48
parent c1e34513d3 4361239a98
commit 1ae80d0f48
1 changed files with 5 additions and 1 deletions
--- a/runcoms/zlogin
+++ b/runcoms/zlogin
@ -16,7 +16,11 @@
  # Set environment variables for launchd processes.
  if [[ "$OSTYPE" == darwin* ]]; then
    for env_var in PATH MANPATH; do
-      launchctl setenv "$env_var" "${(P)env_var}"
+      if which reattach-to-user-namespace > /dev/null; then
+        reattach-to-user-namespace launchctl setenv "$env_var" "${(P)env_var}"
+      else
+        launchctl setenv "$env_var" "${(P)env_var}" || echo "Launchctl error, possible solution: Install reattach-to-user-namespace"
+      fi
    done
  fi
 } &!