Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 677194 Details for
Bug 412003
x11-apps/xinit: support /usr/share/xsessions in chooser.sh
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Take care of files in /usr/share/xsession
chooser.patch (text/plain), 1.50 KB, created by
Roberto Castagnola
on 2020-12-07 22:24:20 UTC
(
hide
)
Description:
Take care of files in /usr/share/xsession
Filename:
MIME Type:
Creator:
Roberto Castagnola
Created:
2020-12-07 22:24:20 UTC
Size:
1.50 KB
patch
obsolete
>--- a/usr/portage/x11-apps/xinit/files/chooser.sh 2017-02-28 21:43:13.000000000 +0100 >+++ b/usr/portage/x11-apps/xinit/files/chooser.sh 2020-12-07 23:07:30.894288938 +0100 >@@ -13,11 +13,21 @@ > fi > done > >+# Find a match for $XSESSION in /usr/share/xsessions >+DESKTOP_XSESSION="" >+for y in /usr/share/xsessions/*.desktop ; do >+ if [ "`echo ${y##*/} | awk '{ print toupper($1) }'`" \ >+ = "`echo ${XSESSION}.desktop | awk '{ print toupper($1) }'`" ]; then >+ DESKTOP_XSESSION=${y} >+ break >+ fi >+done >+ > GENTOO_EXEC="" > > if [ -n "${XSESSION}" ]; then >- if [ -f /etc/X11/Sessions/${XSESSION} ]; then >- if [ -x /etc/X11/Sessions/${XSESSION} ]; then >+ if [ -f "/etc/X11/Sessions/${XSESSION}" ]; then >+ if [ -x "/etc/X11/Sessions/${XSESSION}" ]; then > GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" > else > GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" >@@ -28,7 +38,9 @@ > else > GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" > fi >- else >+ elif [ -n "${DESKTOP_XSESSION}" ]; then >+ EXEC="`sed -n -e 's/^Exec=//p' <${DESKTOP_XSESSION}`" >+ elif [ "${XSESSION}" = "`echo ${XSESSION} | tr -d ' '`" ]; then > x="" > y="" > >@@ -42,6 +54,23 @@ > break > fi > done >+ else # XSESSION contains spaces >+ EXEC="${XSESSION}" >+ fi >+ if [ -n "${EXEC}" ]; then >+ x="${EXEC%% *}" >+ if [ "${x}" = "${EXEC}" ]; then >+ y="" >+ else >+ y="${EXEC#* }" >+ fi >+ >+ if [ -x "`which ${x} 2>/dev/null`" ]; then >+ GENTOO_EXEC="`which ${x} 2>/dev/null`" >+ if [ -n "${y}" ]; then >+ GENTOO_EXEC="${GENTOO_EXEC} ${y}" >+ fi >+ fi > fi > fi >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 412003
: 677194