Skip to content

Commit

Permalink
Convert cosmic-comp.service and cosmic.desktop to templates
Browse files Browse the repository at this point in the history
Replace variables with empty str for normal install and with
'Debug ' and 'debug-' for debug installs.
  • Loading branch information
Nashenas88 committed Jan 26, 2025
1 parent 6ba0a08 commit 892046a
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 174 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ vendor.tar
.vscode
*.log
/result
build/*
22 changes: 16 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,29 @@ install:
install -Dm0644 "data/keybindings.ron" "$(KEYBINDINGS_CONF)"
install -Dm0644 "data/tiling-exceptions.ron" "$(TILING_EXCEPTIONS_CONF)"

install-bare-session: install
install -Dm0644 "data/cosmic.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic.desktop"
gen-template:
mkdir build || true
sed -f data/replace.sed data/cosmic-comp.service > build/cosmic-comp.service
sed -f data/replace.sed data/cosmic.desktop > build/cosmic.desktop

install-bare-session: install gen-template
install -Dm0644 "build/cosmic.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/cosmic.desktop"
install -Dm0644 "data/cosmic-session.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-session.target"
install -Dm0644 "data/cosmic-session-pre.target" "$(DESTDIR)$(libdir)/systemd/user/cosmic-session-pre.target"
install -Dm0644 "data/cosmic-comp.service" "$(DESTDIR)$(libdir)/systemd/user/cosmic-comp.service"
install -Dm0644 "build/cosmic-comp.service" "$(DESTDIR)$(libdir)/systemd/user/cosmic-comp.service"
install -Dm0755 "data/cosmic-service" "$(DESTDIR)/$(bindir)/cosmic-service"

install-debug:
install -Dm0755 "$(CARGO_TARGET_DIR)/$(TARGET)/$(BINARY)" "$(DEBUG_TARGET_BIN)"

install-debug-session: install-debug
install -Dm0644 "debug-data/debug-cosmic.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/debug-cosmic.desktop"
install -Dm0644 "debug-data/debug-cosmic-comp.service" "$(DESTDIR)$(libdir)/systemd/user/debug-cosmic-comp.service"
gen-debug-template:
mkdir build || true
sed -f debug-data/replace.sed data/cosmic-comp.service > build/debug-cosmic-comp.service
sed -f debug-data/replace.sed data/cosmic.desktop > build/debug-cosmic.desktop

install-debug-session: install-debug gen-debug-template
install -Dm0644 "build/debug-cosmic.desktop" "$(DESTDIR)$(sharedir)/wayland-sessions/debug-cosmic.desktop"
install -Dm0644 "build/debug-cosmic-comp.service" "$(DESTDIR)$(libdir)/systemd/user/debug-cosmic-comp.service"
install -Dm0755 "debug-data/debug-cosmic-service" "$(DESTDIR)/$(bindir)/debug-cosmic-service"

uninstall:
Expand Down
4 changes: 2 additions & 2 deletions data/cosmic-comp.service
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[Unit]
Description=Cosmic wayland compositor
Description=${DEBUG_STR}Cosmic wayland compositor
BindsTo=cosmic-session.target
Wants=cosmic-session-pre.target
After=cosmic-session-pre.target
Before=cosmic-session.target

[Service]
Type=notify
ExecStart=/usr/bin/cosmic-comp
ExecStart=/usr/bin/${DEBUG_BIN}cosmic-comp
Restart=never
ExecStopPost=/usr/bin/systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY
4 changes: 2 additions & 2 deletions data/cosmic.desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Cosmic
Name=${DEBUG_STR}Cosmic
Commment=This session logs you into Cosmic
Exec=/usr/bin/cosmic-service
Exec=/usr/bin/${DEBUG_BIN}cosmic-service
Type=Application
DesktopNames=pop:COSMIC
X-GDM-SessionRegisters=false
2 changes: 2 additions & 0 deletions data/replace.sed
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
s/${DEBUG_STR}//g
s/${DEBUG_BIN}//g
12 changes: 0 additions & 12 deletions debug-data/debug-cosmic-comp.service

This file was deleted.

7 changes: 0 additions & 7 deletions debug-data/debug-cosmic.desktop

This file was deleted.

95 changes: 0 additions & 95 deletions debug-data/keybindings.ron

This file was deleted.

2 changes: 2 additions & 0 deletions debug-data/replace.sed
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
s/${DEBUG_STR}/Debug /g
s/${DEBUG_BIN}/debug-/g
50 changes: 0 additions & 50 deletions debug-data/tiling-exceptions.ron

This file was deleted.

0 comments on commit 892046a

Please sign in to comment.