-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: workaround trixie bug which causes desktop sessions to fail. Add…
- Loading branch information
Showing
4 changed files
with
68 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#!/bin/bash | ||
# shellcheck disable=SC1091 | ||
set -Eeu -o pipefail | ||
|
||
SESSION_TYPE="regolith-wayland" | ||
|
||
if [[ "$SESSION_TYPE" == "regolith-x11" ]]; then | ||
echo "Starting x11 Session..." | ||
|
||
if [ -z "$XDG_CURRENT_DESKTOP" ]; then | ||
export XDG_CURRENT_DESKTOP="Regolith:GNOME-Flashback:GNOME" | ||
fi | ||
elif [[ "$SESSION_TYPE" == "regolith-wayland" ]]; then | ||
echo "Starting Wayland Session..." | ||
else | ||
echo "Session type must be specified by caller: regolith-wayland, regolith-x11. Unrecognized: '$SESSION_TYPE'" | ||
exit 1 | ||
fi | ||
|
||
# Determine gnome-session api based on system, since `gnome-session --version` returns "" | ||
if [ -f /etc/os-release ]; then | ||
source /etc/os-release | ||
|
||
if [[ "$VERSION_CODENAME" == "jammy" || "$VERSION_CODENAME" == "bookworm" ]]; then | ||
echo "Using gnome-session built-in session" | ||
exec gnome-session --builtin --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
else | ||
exec gnome-session --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
fi | ||
else | ||
echo "No /etc/os-release, guessing gnome-session cli api..." | ||
exec gnome-session --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#!/bin/bash | ||
# shellcheck disable=SC1091 | ||
set -Eeu -o pipefail | ||
|
||
SESSION_TYPE="regolith-x11" | ||
|
||
if [[ "$SESSION_TYPE" == "regolith-x11" ]]; then | ||
echo "Starting x11 Session..." | ||
|
||
if [ -z "$XDG_CURRENT_DESKTOP" ]; then | ||
export XDG_CURRENT_DESKTOP="Regolith:GNOME-Flashback:GNOME" | ||
fi | ||
elif [[ "$SESSION_TYPE" == "regolith-wayland" ]]; then | ||
echo "Starting Wayland Session..." | ||
else | ||
echo "Session type must be specified by caller: regolith-wayland, regolith-x11. Unrecognized: '$SESSION_TYPE'" | ||
exit 1 | ||
fi | ||
|
||
# Determine gnome-session api based on system, since `gnome-session --version` returns "" | ||
if [ -f /etc/os-release ]; then | ||
source /etc/os-release | ||
|
||
if [[ "$VERSION_CODENAME" == "jammy" || "$VERSION_CODENAME" == "bookworm" ]]; then | ||
echo "Using gnome-session built-in session" | ||
exec gnome-session --builtin --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
else | ||
exec gnome-session --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
fi | ||
else | ||
echo "No /etc/os-release, guessing gnome-session cli api..." | ||
exec gnome-session --session=$SESSION_TYPE --disable-acceleration-check "$@" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[Desktop Entry] | ||
Name=Regolith / Wayland | ||
Comment=Productivity focused desktop environment | ||
Exec=/usr/bin/regolith-session regolith-wayland | ||
Exec=/usr/bin/regolith-session-trixie-wayland | ||
TryExec=/usr/bin/regolith-session | ||
Type=Application |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
[Desktop Entry] | ||
Name=Regolith / X11 | ||
Comment=Productivity focused desktop environment | ||
Exec=/usr/bin/regolith-session regolith-x11 | ||
Exec=/usr/bin/regolith-session-trixie-x11 | ||
TryExec=/usr/bin/regolith-session | ||
Type=Application | ||
DesktopNames=Regolith;GNOME-Flashback;GNOME |