From 7400d68b44d3b62444a22fa2c275535bdea9c6be Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 8 Jul 2020 00:39:39 -0500
Subject: [PATCH] Lots: Fix being unable to start session with SDDM
---
.firestarter | 2 +-
.xinitrc | 10 ++++++++++
.xsessionrc | 18 +-----------------
3 files changed, 12 insertions(+), 18 deletions(-)
mode change 100755 => 120000 .xsessionrc
diff --git a/.firestarter b/.firestarter
index b054d1d1..9bf854d2 160000
--- a/.firestarter
+++ b/.firestarter
@@ -1 +1 @@
-Subproject commit b054d1d1cacb4bec8ecdcd0e62f04d1ac4586eb0
+Subproject commit 9bf854d22f3ac13800fa79bd20403fb57c3f6f3b
diff --git a/.xinitrc b/.xinitrc
index 17f81caf..aacd6095 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,15 @@
#!/bin/bash
+if [ -n "$FIRESTARTER" ]; then
+ echo "Firestarter is already running in this session"
+ exit 50
+fi
+for term in mate-terminal lxterminal xfce4-terminal konsole urxvt xterm; do
+ if command -v "$term" > /dev/null 2>&1; then
+ export TERMINAL="$term"
+ break
+ fi
+done
if [ -x "$HOME/.wpgen/wpgen" ]; then
resolutions=($(xrandr -q | grep '*' | awk '{print $1}'))
for res in ${resolutions[@]}; do
diff --git a/.xsessionrc b/.xsessionrc
deleted file mode 100755
index d1146f3e..00000000
--- a/.xsessionrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-export XSESSION_HAS_SOURCED=1
-for term in mate-terminal lxterminal xfce4-terminal konsole urxvt xterm; do
- if command -v "$term" > /dev/null 2>&1; then
- export TERMINAL="$term"
- break
- fi
-done
-if command -v qt5ct > /dev/null 2>&1; then
- export QT_QPA_PLATFORMTHEME=qt5ct
- export QT_AUTO_SCREEN_SCALE_FACTOR=0
-fi
-
-export PATH="$PATH:$HOME/.bin:$HOME/.local/bin"
-if command -v go > /dev/null 2>&1; then
- export PATH="$PATH:$HOME/.local/go/bin"
-fi
diff --git a/.xsessionrc b/.xsessionrc
new file mode 120000
index 00000000..03280dfd
--- /dev/null
+++ b/.xsessionrc
@@ -0,0 +1 @@
+.xinitrc
\ No newline at end of file