From 0fb9f76d3f0205298b0d98c5b0a9a09c4e418388 Mon Sep 17 00:00:00 2001 From: ayekat Date: Thu, 12 Jan 2023 22:06:50 +0100 Subject: startx: Assign XSERVERRC to correct userserverrc Also fix same mistake in the startx manpage. Signed-off-by: ayekat --- man/startx.man | 2 +- startx.cpp | 2 +- 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 -- cgit v1.2.3