From 0e584384eafdf0e4e242f6572b0588fbd44cdd53 Mon Sep 17 00:00:00 2001
From: speediegq <speedie.alt@gmail.com>
Date: Sun, 9 Oct 2022 15:30:28 +0200
Subject: [PATCH] Add entry and copy it so we don't need the dm script

---
 Makefile           |   4 +-
 docs/entry.desktop |   7 +++
 scripts/speedwm-dm | 110 ---------------------------------------------
 3 files changed, 9 insertions(+), 112 deletions(-)
 create mode 100644 docs/entry.desktop
 delete mode 100755 scripts/speedwm-dm

diff --git a/Makefile b/Makefile
index 62caca3..c958ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@ install: all
 	@echo "CC       = [${CC}]"
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	mkdir -p ${DESTDIR}${PREFIX}/share/speedwm
+	mkdir -p ${DESTDIR}${PREFIX}/share/xsessions/
 	[ -f speedwm-msg ] && cp -f speedwm speedwm-msg ${DESTDIR}${PREFIX}/bin || :
 	[ -f docs/autostart.def.h ] || cp -f autostart.h docs/autostart.def.h || :
 	[ -f docs/options.def.h ] || cp -f options.h docs/options.def.h || :
@@ -67,6 +68,7 @@ install: all
 	[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
 	[ -f docs/statusbar.def.h ] || cp -f statusbar.h docs/statusbar.def.h || :
 	[ -f docs/status.def ] || cp -f status docs/status.def || :
+	[ -f docs/entry.desktop ] && cp -f docs/entry.desktop ${DESTDIR}${PREFIX}/share/xsessions/speedwm.desktop
 	[ -f speedwm-msg ] && chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm-msg || :
 	[ -f speedwm.png ] && cp -f speedwm.png ${DESTDIR}${PREFIX}/share/pixmaps/speedwm.png || :
 	cp -f docs/keybinds ${DESTDIR}${PREFIX}/share/speedwm/keybinds
@@ -76,10 +78,8 @@ install: all
 	cp -f scripts/speedwm* ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/speedwm*
 	cp -f status ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/status
 	chmod +x ./scripts/speedwm-compatcheck
-	chmod +x ./scripts/speedwm-dm
 	chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm
 	./scripts/speedwm-compatcheck
-	./scripts/speedwm-dm
 	make modules_install
 	[ -f ${DESTDIR}${PREFIX}/bin/speedwm ] && rm -f drw.o speedwm.o util.o speedwm speedwm-msg || :
 
diff --git a/docs/entry.desktop b/docs/entry.desktop
new file mode 100644
index 0000000..ca274c7
--- /dev/null
+++ b/docs/entry.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=speedwm
+Comment=speedwm: speedie's window manager
+Exec=/usr/bin/speedwm_run
+Icon=speedwm
+Type=XSession
\ No newline at end of file
diff --git a/scripts/speedwm-dm b/scripts/speedwm-dm
deleted file mode 100755
index 4c6c01b..0000000
--- a/scripts/speedwm-dm
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-# speedwm-dm
-# Create a .desktop file for people who use display managers.
-
-# Make the directory for the .desktop file if it does not exist
-mkdir -p /usr/share/xsessions
-
-# Write the .desktop entry
-printf "[Desktop Entry]\nEncoding=UTF-8\nName=speedwm\nComment=speedwm: speedie's window manager\nExec=/usr/bin/speedwm_run\nIcon=speedwm\nType=XSession" > /usr/share/xsessions/speedwm.desktop
-
-# Print all of it
-sed "s/#define //g" toggle.h | grep LAYOUT | sed "s|/[*]|#|g;  s|[*]/||g; s/ //g; s/1/=1/g; s/0/=0/g; s/#/ # /g" > /usr/share/speedwm/layouts
-
-. /usr/share/speedwm/layouts
-
-AVAILABLE_LAYOUTS="$(printf "${AVAILABLE_LAYOUTS}Floating")"
-
-# Tile
-if [ "$LAYOUT_TILE" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Tiling"
-fi
-
-# Tile (5:4)
-if [ "$LAYOUT_TILE54" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Tiling 5:4"
-fi
-
-# Monocle
-if [ "$LAYOUT_MONOCLE" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Monocle"
-fi
-
-# Grid
-if [ "$LAYOUT_GRID" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Grid"
-fi
-
-# Dwindle
-if [ "$LAYOUT_DWINDLE" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Dwindle"
-fi
-
-# Spiral
-if [ "$LAYOUT_SPIRAL" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Spiral"
-fi
-
-# Three Columns
-if [ "$LAYOUT_TCL" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Three Columns"
-fi
-
-# Bottom Stack
-if [ "$LAYOUT_BSTACK" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Bottom Stack"
-fi
-
-# Horizontal Bottom Stack
-if [ "$LAYOUT_BSTACKH" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Horizontal Bottom Stack"
-fi
-
-# Horizontal Grid
-if [ "$LAYOUT_HGRID" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Horizontal Grid"
-fi
-
-# Dynamic Grid
-if [ "$LAYOUT_DGRID" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Dynamic Grid"
-fi
-
-# Tatami
-if [ "$LAYOUT_TATAMI" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Tatami"
-fi
-
-# Tilewide
-if [ "$LAYOUT_TW" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Tilewide"
-fi
-
-# Centered Master
-if [ "$LAYOUT_CM" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Centered Master"
-fi
-
-# Centered Floating Master
-if [ "$LAYOUT_CFM" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Centered Floating Master"
-fi
-
-# Deck
-if [ "$LAYOUT_DECK" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Deck"
-fi
-
-# Columns
-if [ "$LAYOUT_COL" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Columns"
-fi
-
-# Stairs
-if [ "$LAYOUT_STAIRS" = "1" ]; then
-		AVAILABLE_LAYOUTS="${AVAILABLE_LAYOUTS} Stairs"
-fi
-
-AVAILABLE_LAYOUTS="$(printf "$AVAILABLE_LAYOUTS" | sed "s/ /, /g")"
-
-exit 0