summaryrefslogtreecommitdiffstats
path: root/startkde
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 23:19:12 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 23:19:12 +0000
commit3d034e290e3323b0e17cd7e24ef75e7fdd8c8365 (patch)
tree2e3f8237550b5e8930c52567ce23e99600738f5e /startkde
parent40da2a271a8ef5836cf489e3183e0a33aec46202 (diff)
downloadtdebase-3d034e290e3323b0e17cd7e24ef75e7fdd8c8365.tar.gz
tdebase-3d034e290e3323b0e17cd7e24ef75e7fdd8c8365.zip
Clean up xset: bad font path element (#79) warning
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176204 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'startkde')
-rw-r--r--startkde5
1 files changed, 4 insertions, 1 deletions
diff --git a/startkde b/startkde
index dd1b9cb87..e2069bc19 100644
--- a/startkde
+++ b/startkde
@@ -408,7 +408,10 @@ fi
# read-only by the administrator, for whatever reason.
# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
-test -d "$sys_odir" && xset +fp "$sys_odir"
+if [ -e $sys_odir/fonts.dir ]
+then
+ xset +fp "$sys_odir"
+fi
test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
test -d "$sys_fdir" && xset fp+ "$sys_fdir"