From 9aad63af8dffa607f61e65490556f8d617e2ced4 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 2 Sep 2015 09:57:08 +0200 Subject: Update the doinst.sh script for sddm-qt5 --- kde/doinst.sh/sddm-qt5 | 16 ++++++++++------ 1 file 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 <> 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 <> etc/sddm.conf.new [XDisplay] MinimumVT=7 EOT +fi # Move over the new confguration file if needed: if [ -f etc/sddm.conf.new ]; then -- cgit v1.2.3