diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-15 04:03:10 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-15 04:03:10 +0000 |
| commit | 549c55ea15e60b9aca5da1ed6f18564f1e69cd26 (patch) | |
| tree | e4add8c60b0d9d9144ed35fc5e7941f384503f20 /xinitrc.cpp | |
| parent | 277975ec73744657e556a0c6380614d8684db7df (diff) | |
Make using full paths in the xinit scripts optional.XORG-6_8_99_903
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index a145d7e..4f52f13 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -9,19 +9,19 @@ sysmodmap=XINITDIR/.Xmodmap XCOMM merge in defaults and keymaps if [ -f $sysresources ]; then - BINDIR/xrdb -merge $sysresources + XRDB -merge $sysresources fi if [ -f $sysmodmap ]; then - BINDIR/xmodmap $sysmodmap + XMODMAP $sysmodmap fi if [ -f $userresources ]; then - BINDIR/xrdb -merge $userresources + XRDB -merge $userresources fi if [ -f $usermodmap ]; then - BINDIR/xmodmap $usermodmap + XMODMAP $usermodmap fi XCOMM start some nice programs @@ -68,8 +68,8 @@ fi XCOMM This is the fallback case if nothing else is executed above #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ -BINDIR/twm & -BINDIR/xclock -geometry 50x50-1+1 & -BINDIR/xterm -geometry 80x50+494+51 & -BINDIR/xterm -geometry 80x20+494-0 & -exec BINDIR/xterm -geometry 80x66+0+0 -name login +TWM & +XCLOCK -geometry 50x50-1+1 & +XTERM -geometry 80x50+494+51 & +XTERM -geometry 80x20+494-0 & +exec XTERM -geometry 80x66+0+0 -name login |