frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

(cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa)
This commit is contained in:
Jeremy Huddleston 2008-12-28 01:53:38 -08:00
parent ae8dc47fd9
commit 997e8c321b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xquartz/bundle/X11.sh
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