summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorayekat <takeya@bluewin.ch>2023-01-12 22:06:50 +0100
committerayekat <takeya@bluewin.ch>2023-01-12 22:21:12 +0100
commit0fb9f76d3f0205298b0d98c5b0a9a09c4e418388 (patch)
tree5a8196d4512f0559be7a2fc19cd6d88b512d003e
parent3172dc7e15b7a249555ca12e24f4a787164a7f8a (diff)
downloadxorg-app-xinit-0fb9f76d3f0205298b0d98c5b0a9a09c4e418388.tar.gz
startx: Assign XSERVERRC to correct userserverrcHEADmaster
Also fix same mistake in the startx manpage. Signed-off-by: ayekat <takeya@bluewin.ch>
-rw-r--r--man/startx.man2
-rw-r--r--startx.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/startx.man b/man/startx.man
index 2fe952d..1c48a66 100644
--- a/man/startx.man
+++ b/man/startx.man
@@ -177,7 +177,7 @@ will be used.
.TP 25
XSERVERRC
This variable should contain the location of an xserver file. If unset,
-.I $(HOME)/.xinitrc
+.I $(HOME)/.xserverrc
or
.I __xinitdir__/xserverrc
will be used.
diff --git a/startx.cpp b/startx.cpp
index dfbebe1..c38ff21 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -52,7 +52,7 @@ userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
userserverrc=$HOME/.xserverrc
-[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}"
+[ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}"
sysserverrc=XINITDIR/xserverrc
defaultclient=XTERM
defaultserver=XSERVER