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 | |
| parent | 277975ec73744657e556a0c6380614d8684db7df (diff) | |
Make using full paths in the xinit scripts optional.XORG-6_8_99_903
| -rw-r--r-- | startx.cpp | 16 | ||||
| -rw-r--r-- | xinitrc.cpp | 18 |
2 files changed, 17 insertions, 17 deletions
@@ -64,8 +64,8 @@ sysclientrc=XINITDIR/xinitrc userserverrc=$HOME/.xserverrc sysserverrc=XINITDIR/xserverrc -defaultclient=BINDIR/xterm -defaultserver=BINDIR/X +defaultclient=XTERM +defaultserver=XSERVER defaultclientargs="" defaultserverargs="" clientargs="" @@ -200,16 +200,16 @@ XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists don't overwrite it as another XCOMM server man need it. Add them to the '$xserverauthfile' instead. for displayname in $authdisplay $hostname$authdisplay; do - authcookie=`BINDIR/xauth list "$displayname" @@ + authcookie=`XAUTH list "$displayname" @@ | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; if [ "z${authcookie}" = "z" ] ; then - BINDIR/xauth -q << EOF + XAUTH -q << EOF add $displayname . $mcookie EOF removelist="$displayname $removelist" else dummy=$((dummy+1)); - BINDIR/xauth -q -f $xserverauthfile << EOF + XAUTH -q -f $xserverauthfile << EOF add :$dummy . $authcookie EOF fi @@ -221,14 +221,14 @@ done if [ "$REMOTE_SERVER" = "TRUE" ]; then exec SHELL_CMD ${client} else - BINDIR/xinit $client $clientargs -- $server $display $serverargs + XINIT $client $clientargs -- $server $display $serverargs fi #else -BINDIR/xinit $client $clientargs -- $server $display $serverargs +XINIT $client $clientargs -- $server $display $serverargs #endif if [ x"$removelist" != x ]; then - BINDIR/xauth remove $removelist + XAUTH remove $removelist fi if [ x"$xserverauthfile" != x ]; then rm -f $xserverauthfile 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 |