summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-09-02 09:57:08 +0200
committer Eric Hameleers <alien@slackware.com>2015-09-02 09:57:08 +0200
commit9aad63af8dffa607f61e65490556f8d617e2ced4 (patch)
tree0288f91136f4be8a942272ed5530aef1c530f442
parentaf5fe581cb81e5408fd8b221e50189a125bcc46b (diff)
downloadktown-9aad63af8dffa607f61e65490556f8d617e2ced4.tar.gz
ktown-9aad63af8dffa607f61e65490556f8d617e2ced4.tar.xz
Update the doinst.sh script for sddm-qt5
-rw-r--r--kde/doinst.sh/sddm-qt516
1 files changed, 10 insertions, 6 deletions
diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index 88ab236..c9f6a8d 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -55,17 +55,21 @@ chown -R sddm:sddm $sddmhome > /dev/null
# Generate a new configuration file if it does not exist:
chroot . sddm --example-config > /etc/sddm.conf.new
-# Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5:
-sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" etc/sddm.conf.new
+if ! grep -q "Current=breeze" etc/sddm.conf.new ; then
+ # Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5:
+ sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" etc/sddm.conf.new
+fi
-# SDDM follows the systemd convention of starting the first graphical session
-# on tty1. We prefer the old convention where tty1 through tty6
-# are reserved for text consoles:
-cat <<EOT >> etc/sddm.conf.new
+if ! grep -q "MinimumVT=7" etc/sddm.conf.new ; then
+ # SDDM follows the systemd convention of starting the first graphical session
+ # on tty1. We prefer the old convention where tty1 through tty6
+ # are reserved for text consoles:
+ cat <<EOT >> etc/sddm.conf.new
[XDisplay]
MinimumVT=7
EOT
+fi
# Move over the new confguration file if needed:
if [ -f etc/sddm.conf.new ]; then