X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6506171c57ef5625d06f0e578fe216a977323812;hb=b7b3a93d3974a9f722108dfa4a8c7126e6dd716a;hp=6a980a346d90661237a8366713f74f50c17e34a6;hpb=d6507ad9c6de60f9e14c7c448d3a909151b92542;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 6a980a3..6506171 100755 --- a/setup.sh +++ b/setup.sh @@ -46,13 +46,16 @@ if installed X; then } else { print $_; }' - # Xdefaults uses ! as comment instead of #. tmp file necessary because of - # different implementations of `sed -i`. - sed 's/^#/!/' Xdefaults > Xdefaults.tmp - mv Xdefaults.tmp Xdefaults + # Xdefaults uses ! as comment instead of #. + sed_i 's/^#/!/' Xdefaults if test ! "x`os`" = xdarwin; then link xinitrc ~/.xinitrc + # lightdm doesn't use ~/.xinitrc but ~/.xprofile instead. Assume it's + # used when the lightdm configuration file is present. + if test -f "$HOME/.dmrc"; then + link xinitrc ~/.xprofile + fi fi if test -f xinitrc.local; then link xinitrc.local ~/.xinitrc.local