Skip to content

Commit 465e251

Browse files
chore: rename bare-session files not to overwrite cosmic-session
Running `make install-bare-session` installs a compositor-only session. It should not rewrite files installed by `cosmic-session`.
1 parent 4adb074 commit 465e251

7 files changed

Lines changed: 20 additions & 21 deletions

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ install:
5353
install -Dm0644 "data/tiling-exceptions.ron" "$(TILING_EXCEPTIONS_CONF)"
5454

5555
install-bare-session: install
56-
install -Dm0644 "data/cosmic.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic.desktop"
57-
install -Dm0644 "data/cosmic-session.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-session.target"
58-
install -Dm0644 "data/cosmic-session-pre.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-session-pre.target"
56+
install -Dm0644 "data/cosmic-comp.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic-comp.desktop"
57+
install -Dm0644 "data/cosmic-comp-session.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-comp-session.target"
58+
install -Dm0644 "data/cosmic-comp-session-pre.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-comp-session-pre.target"
5959
install -Dm0644 "data/cosmic-comp.service" "$(DESTDIR)$(libdir)/systemd/user/cosmic-comp.service"
60-
install -Dm0755 "data/cosmic-service" "$(DESTDIR)/$(bindir)/cosmic-service"
60+
install -Dm0755 "data/cosmic-comp-service" "$(DESTDIR)/$(bindir)/cosmic-comp-service"
6161

6262
uninstall:
6363
rm "$(TARGET_BIN)" "$(KEYBINDINGS_CONF)"
6464

6565
uninstall-bare-session:
66-
rm "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic.desktop"
66+
rm "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic-comp.desktop"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# reset them so that they don't break this startup
77
for unit in $(systemctl --user --no-legend --state=failed --plain list-units | cut -f1 -d' '); do
88
partof="$(systemctl --user show -p PartOf --value "$unit")"
9-
for target in cosmic-session.target graphical-session.target; do
9+
for target in cosmic-comp-session.target graphical-session.target; do
1010
if [ "$partof" = "$target" ]; then
1111
systemctl --user reset-failed "$unit"
1212
break
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[Unit]
2-
Description=Cosmic session early services
2+
Description=Cosmic compositor-only session early services
33
Documentation=man:systemd.special(7)
44
RefuseManualStart=yes
55
StopWhenUnneeded=yes
66
BindsTo=graphical-session-pre.target
77
Before=graphical-session-pre.target
8-
Before=cosmic-session.target
8+
Before=cosmic-comp-session.target
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Unit]
2-
Description=Cosmic session
2+
Description=Cosmic compositor-only session
33
Documentation=man:systemd.special(7)
44
RefuseManualStart=yes
55
StopWhenUnneeded=yes

data/cosmic-comp.desktop

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Desktop Entry]
2+
Name=Cosmic (Compositor Only)
3+
Comment=This session logs you into a bare cosmic-comp session
4+
Exec=/usr/bin/cosmic-comp-service
5+
Type=Application
6+
DesktopNames=pop:COSMIC
7+
X-GDM-SessionRegisters=false

data/cosmic-comp.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[Unit]
22
Description=Cosmic wayland compositor
3-
BindsTo=cosmic-session.target
4-
Wants=cosmic-session-pre.target
5-
After=cosmic-session-pre.target
6-
Before=cosmic-session.target
3+
BindsTo=cosmic-comp-session.target
4+
Wants=cosmic-comp-session-pre.target
5+
After=cosmic-comp-session-pre.target
6+
Before=cosmic-comp-session.target
77

88
[Service]
99
Type=notify

data/cosmic.desktop

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)