Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xorg
Commits:
2e175516 by Jochen Sprickerhof at 2022-12-06T21:30:28+01:00
Rely on command -v to check for an executable
command -v could prefer shell builtins that don't have a full path (true
instead of bin/true). Resulting in a failing Xsession for example with:
/etc/X11/Xsession true
As command -v already checks if the command is executable, we can remove
the extra check.
Closes: #1012474
Regression of 3d6bd60
- - - - -
1 changed file:
- debian/local/Xsession.d/20x11-common_process-args
Changes:
=====================================
debian/local/Xsession.d/20x11-common_process-args
=====================================
@@ -33,14 +33,8 @@ case $# in
;;
*)
# Specific program was requested.
- STARTUP_FULL_PATH=$(command -v "${1%% *}" || true)
- if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
- if [ -x "$STARTUP_FULL_PATH" ]; then
- STARTUP="$1"
- else
- message "unable to launch \"$1\" X session ---" \
- "\"$1\" not executable; falling back to default session."
- fi
+ if command -v "$1" >/dev/null; then
+ STARTUP="$1"
else
message "unable to launch \"$1\" X session ---" \
"\"$1\" not found; falling back to default session."
View it on GitLab:
https://salsa.debian.org/xorg-team/xorg/-/commit/2e1755166a88c8631d1ed88fac4f7f63b05f29dd
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xorg/-/commit/2e1755166a88c8631d1ed88fac4f7f63b05f29dd
You're receiving this email because of your account on salsa.debian.org.
