From 0e07a33dec1e4693d88175829625c4451335e493 Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com>
Date: Sun, 14 Apr 2019 11:57:19 -0400
Subject: [PATCH] Refactored session-switcher unit file, recipe cleanups

---
 .../citadel-config/files/systemd/session-switcher.service   | 6 +++++-
 meta-citadel/recipes-sway/grim/grim_git.bb                  | 2 +-
 meta-citadel/recipes-sway/sgflow/sgflow_git.bb              | 2 +-
 meta-citadel/recipes-sway/slurp/slurp_git.bb                | 2 +-
 meta-citadel/recipes-sway/sway/sway_git.bb                  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/session-switcher.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/session-switcher.service
index 9241d1f..2f8e00f 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/session-switcher.service
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/session-switcher.service
@@ -3,10 +3,14 @@ Description=Session Switcher
 After=accounts-daemon.service
 Wants=accounts-daemon.service
 
+ConditionKernelCommandLine=|citadel.sway
+
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/bin/sh -c 'for arg in `cat /proc/cmdline`; do case $arg in sway) /usr/bin/busctl call org.freedesktop.Accounts /org/freedesktop/Accounts/User1000 org.freedesktop.Accounts.User SetXSession s "sway"; esac; done'
+
+ExecStartPre=-/usr/bin/plymouth message --text="Setting session to sway"
+ExecStart=/usr/bin/busctl call org.freedesktop.Accounts /org/freedesktop/Accounts/User1000 org.freedesktop.Accounts.User SetXSession s "sway"
 
 [Install]
 WantedBy=graphical.target
diff --git a/meta-citadel/recipes-sway/grim/grim_git.bb b/meta-citadel/recipes-sway/grim/grim_git.bb
index 2480081..61d2eb6 100644
--- a/meta-citadel/recipes-sway/grim/grim_git.bb
+++ b/meta-citadel/recipes-sway/grim/grim_git.bb
@@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "c58ec15558debbb33e3390250e38375bc80b2275c8e902680424f7837b
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
 
-SRC_URI = "gitsm://github.com/emersion/grim" 
+SRC_URI = "git://github.com/emersion/grim;protocol=https"
 PV = "0.1+git${SRCPV}"
 PR = "r0"
 
diff --git a/meta-citadel/recipes-sway/sgflow/sgflow_git.bb b/meta-citadel/recipes-sway/sgflow/sgflow_git.bb
index 9fd2597..45ebc5d 100644
--- a/meta-citadel/recipes-sway/sgflow/sgflow_git.bb
+++ b/meta-citadel/recipes-sway/sgflow/sgflow_git.bb
@@ -4,7 +4,7 @@ inherit meson pkgconfig
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f0ae30b1ae6ac2aff356f848cfe6bd04"
 
-SRC_URI = "gitsm://github.com/subgraph/sgflow \
+SRC_URI = "git://github.com/subgraph/sgflow;protocol=https \
            "
 PV = "0.1.0+git${SRCPV}"
 PR = "r0"
diff --git a/meta-citadel/recipes-sway/slurp/slurp_git.bb b/meta-citadel/recipes-sway/slurp/slurp_git.bb
index d79ccce..ec1f2c3 100644
--- a/meta-citadel/recipes-sway/slurp/slurp_git.bb
+++ b/meta-citadel/recipes-sway/slurp/slurp_git.bb
@@ -4,7 +4,7 @@ inherit meson pkgconfig
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
 
-SRC_URI = "gitsm://github.com/emersion/slurp" 
+SRC_URI = "git://github.com/emersion/slurp;protocol=https"
 PV = "0.1+git${SRCPV}"
 PR = "r0"
 
diff --git a/meta-citadel/recipes-sway/sway/sway_git.bb b/meta-citadel/recipes-sway/sway/sway_git.bb
index 9667413..5b888b9 100644
--- a/meta-citadel/recipes-sway/sway/sway_git.bb
+++ b/meta-citadel/recipes-sway/sway/sway_git.bb
@@ -6,7 +6,7 @@ SRCREV = "bcde298a719f60b9913133dbd2a169dedbc8dd7d"
 PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
-SRC_URI = "gitsm://github.com/swaywm/sway \
+SRC_URI = "git://github.com/swaywm/sway;protocol=https \
            file://config \
            "