On Fri, Feb 17, 2023 at 11:52:44AM +0000, Laurence Tratt wrote:
> On Thu, Feb 16, 2023 at 09:29:53PM +0300, Mikhail wrote:
>
> Hello Mikhail,
>
> > /etc/X11/xenodm/Xsession file has a check for x bit
>
> Yes, this one caught me out a few years back:
>
> https://marc.info/?l=openbsd-bugs&m=162737223625768&w=2
>
> In subsequent discussions with Matthieu and Theo, I *think* the eventual
> thought was that it would be better to get rid of the `-x` check. I might be
> misremembering that, though.
>
I'm fine with not runing the script if not executable. I don't
remember exactly why I didn't do it when you brought the issue up in
2021. But I prefer to use the fallback session when the script exists
and isn't executable rather than letting the session fail immediatly.
ok?
Index: config/Xsession.in
===================================================================
RCS file: /local/cvs/xenocara/app/xenodm/config/Xsession.in,v
retrieving revision 1.2
diff -u -p -u -r1.2 Xsession.in
--- config/Xsession.in 1 Jul 2022 20:42:06 -0000 1.2
+++ config/Xsession.in 18 Feb 2023 06:56:22 -0000
@@ -58,12 +58,8 @@ esac
startup=$HOME/.xsession
resources=$HOME/.Xresources
-if [ -s "$startup" ]; then
- if [ -x "$startup" ]; then
- "$startup"
- else
- /bin/sh "$startup"
- fi
+if [ -s "$startup" -a -x "$startup" ]; then
+ "$startup"
else
if [ -f "$resources" ]; then
@XRDB_PROGRAM@ -load "$resources"
--
Matthieu Herrb
