XQuartz: Try harder to get the user's login environment

(cherry picked from commit 6bedaddd78)
This commit is contained in:
Jeremy Huddleston 2008-12-28 01:53:38 -08:00
parent ae8dc47fd9
commit 997e8c321b

View File

@ -1,8 +1,15 @@
#!/bin/bash --login
#!/bin/bash
set "$(dirname "$0")"/X11.bin "${@}"
if [ -x ~/.x11run ]; then
exec ~/.x11run "$(dirname "$0")"/X11.bin "${@}"
else
exec "$(dirname "$0")"/X11.bin "${@}"
exec ~/.x11run "${@}"
fi
case $(basename "${SHELL}") in
bash) exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;;
ksh|sh|zsh) exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;;
csh|tcsh) exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;;
es|rc) exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;;
*) exec "${@}" ;;
esac