diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2022-06-19 20:09:55 -0700 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2022-06-19 20:13:28 -0700 |
| commit | 6bdce31401e3caf10242f1e8a4855b2c8e90ea13 (patch) | |
| tree | 737b591383cb5486aeacbadb7a0aab62be26d0fa | |
| parent | bf1d55c1aeef4d4755e1dbaf05cd625e48780bfb (diff) | |
darwin: Wait for font_cache to complete to avoid a race with `xset fb=`
Partially fixes: https://github.com/XQuartz/XQuartz/issues/216
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
| -rwxr-xr-x | launchd/privileged_startx/20-font_cache.cpp | 6 | ||||
| -rw-r--r-- | startx.cpp | 10 |
2 files changed, 8 insertions, 8 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 |