diff options
| -rwxr-xr-x | launchd/privileged_startx/20-font_cache.cpp | 6 | ||||
| -rw-r--r-- | startx.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/launchd/privileged_startx/20-font_cache.cpp b/launchd/privileged_startx/20-font_cache.cpp index 6d43e10..1048b15 100755 --- a/launchd/privileged_startx/20-font_cache.cpp +++ b/launchd/privileged_startx/20-font_cache.cpp @@ -27,9 +27,9 @@ XCOMM promote the sale, use or other dealings in this Software without XCOMM prior written authorization. if [ -x BINDIR/font_cache ] ; then - BINDIR/font_cache -s & + BINDIR/font_cache -s elif [ -x BINDIR/font_cache.sh ] ; then - BINDIR/font_cache.sh -s & + BINDIR/font_cache.sh -s elif [ -x BINDIR/fc-cache ] ; then - BINDIR/fc-cache & + BINDIR/fc-cache fi @@ -87,17 +87,17 @@ fi XCOMM First, start caching fonts if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then if [ -x $bindir/font_cache ] ; then - $bindir/font_cache & + $bindir/font_cache elif [ -x $bindir/font_cache.sh ] ; then - $bindir/font_cache.sh & + $bindir/font_cache.sh elif [ -x $bindir/fc-cache ] ; then - $bindir/fc-cache & + $bindir/fc-cache fi fi if [ -x __libexecdir__/privileged_startx ] ; then - # Don't push this into the background because it can cause - # a race to create /tmp/.X11-unix + XCOMM Don't push this into the background because it can cause + XCOMM a race to create /tmp/.X11-unix __libexecdir__/privileged_startx fi @@ -271,7 +271,7 @@ if [ x"$enable_xauth" = x1 ] ; then XCOMM create a file with auth information for the server. ':0' is a dummy. xserverauthfile=`mktemp ${HOME}/.serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie EOF |