Added support for '$XINITRC' to getwindowmanager
This commit is contained in:
parent
45b96fa550
commit
7619f71549
12
fetch
12
fetch
|
@ -600,11 +600,11 @@ getwindowmanager () {
|
||||||
elif [ "$XDG_CURRENT_DESKTOP" ]; then
|
elif [ "$XDG_CURRENT_DESKTOP" ]; then
|
||||||
windowmanager="$XDG_CURRENT_DESKTOP"
|
windowmanager="$XDG_CURRENT_DESKTOP"
|
||||||
|
|
||||||
|
elif [ "$XINITRC" ]; then
|
||||||
|
windowmanager=$(grep "^[^#]*exec" "${HOME}/.xinitrc")
|
||||||
|
|
||||||
elif [ -e "$HOME/.xinitrc" ]; then
|
elif [ -e "$HOME/.xinitrc" ]; then
|
||||||
xinitrc=$(grep "^[^#]*exec" "${HOME}/.xinitrc")
|
windowmanager=$(grep "^[^#]*exec" "${HOME}/.xinitrc")
|
||||||
windowmanager="${xinitrc/exec }"
|
|
||||||
windowmanager="${windowmanager/-session}"
|
|
||||||
windowmanager="${windowmanager^}"
|
|
||||||
|
|
||||||
else
|
else
|
||||||
case "$os" in
|
case "$os" in
|
||||||
|
@ -622,6 +622,10 @@ getwindowmanager () {
|
||||||
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
windowmanager="${windowmanager/exec }"
|
||||||
|
windowmanager="${windowmanager/-session}"
|
||||||
|
windowmanager="${windowmanager^}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
Reference in New Issue