From aa026deef43a8c1479e6a558194e0a473bbdaeb0 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 1 Mar 2008 17:30:47 -0800 Subject: Apple: Adding support for an xinitrc.d directory on OSX, so fink doesn't need to clobber files --- xinitrc.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'xinitrc.cpp') diff --git a/xinitrc.cpp b/xinitrc.cpp index e42002d..89a65ca 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -87,20 +87,13 @@ XCOMM This is the fallback case if nothing else is executed above #ifdef __APPLE__ -if [ -x /usr/X11/bin/xset ] ; then - fontpath="/usr/X11/lib/X11/fonts/misc/,/usr/X11/lib/X11/fonts/TTF/,/usr/X11/lib/X11/fonts/OTF,/usr/X11/lib/X11/fonts/Type1/,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled" - - [ -e "$HOME"/.fonts/fonts.dir ] && fontpath="$fontpath,$HOME/.fonts" - [ -e "$HOME"/Library/Fonts/fonts.dir ] && fontpath="$fontpath,$HOME/Library/Fonts" - [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts" - [ -e /System/Library/Fonts/fonts.dir ] && fontpath="$fontpath,/System/Library/Fonts" - - /usr/X11/bin/xset fp= "$fontpath" - unset fontpath +if [ -d XINITDIR/xinitrc.d ] ; then + for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do + [ -x "$f" ] && . "$f" + done + unset f fi -[ -x /usr/bin/quartz-wm ] && exec /usr/bin/quartz-wm - #endif TWM & -- cgit v1.2.3