From f410091e2ad8642ba23a2a38cb49e3058e9cb49a Mon Sep 17 00:00:00 2001
From: nemetho <nemethotto.123@gmail.com>
Date: Sun, 31 Dec 2017 17:13:11 +0100
Subject: [PATCH] improve some other setuptool

---
 scripts/setup/installgrub                      |  6 +++---
 scripts/setup/{installgrub => installgrub.old} |  0
 scripts/setup/setdefsession                    |  4 ++++
 scripts/setup/setxorgkeymap                    | 11 ++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)
 copy scripts/setup/{installgrub => installgrub.old} (100%)

diff --git a/scripts/setup/installgrub b/scripts/setup/installgrub
index 34e6f66..892bc4c 100755
--- a/scripts/setup/installgrub
+++ b/scripts/setup/installgrub
@@ -8,8 +8,8 @@ trap "rm -f $tempfile" 0 1 2 5 15
 lsdev()
 {
 test -L /sys/block/$(ls /sys/block | head -n 1) && \
-    find /sys/devices -path "*/block/*" \( -name "sd[a-z]*" -o -name "ub[a-z]*" \) || \
-    find /sys/block \( -name "sd[a-z]*" -o -name "ub[a-z]*" \)
+    find /sys/devices -path "*/block/*" \( -name "[hs]d[a-z]*" -o -name "ub[a-z]*" \) || \
+    find /sys/block \( -name "[hs]d[a-z]*" -o -name "ub[a-z]*" \)
 }
 
 lsblk()
@@ -24,7 +24,7 @@ lsblk()
 $DIALOG --backtitle "Configuring system settings" \
 	--title "" --clear \
 	--menu "Install boot loader on device" 20 61 15 \
-	`lsblk | sort | sed "s/.*/& </"` 2> $tempfile
+	`lsblk | sed -e 's%^/dev/[hs]d[a-z]%& :%' -e 's%^/dev/ub[a-z]%& :%' | sort -t : -k 1,1 -k 2n | sed -e 's% :%%' -e 's/.*/& </'` 2> $tempfile
 
 retval=$?
 
diff --git a/scripts/setup/installgrub b/scripts/setup/installgrub.old
similarity index 100%
copy from scripts/setup/installgrub
copy to scripts/setup/installgrub.old
diff --git a/scripts/setup/setdefsession b/scripts/setup/setdefsession
index 0144de6..d042546 100755
--- a/scripts/setup/setdefsession
+++ b/scripts/setup/setdefsession
@@ -38,6 +38,10 @@ done
 #ls_sessions
 #exit 0
 
+[ ! -e /usr/share/xsessions ] && exit 1
+LSFILE=`find /usr/share/xsessions -mindepth 1 -maxdepth 1 -print -quit 2> /dev/null`
+[ -z "$LSFILE" ] && exit 1
+
 $DIALOG --backtitle "Select default desktop environment" \
 	--title "" --clear \
 	--menu "" 20 61 15 \
diff --git a/scripts/setup/setxorgkeymap b/scripts/setup/setxorgkeymap
index bbf3c8c..83c88b0 100755
--- a/scripts/setup/setxorgkeymap
+++ b/scripts/setup/setxorgkeymap
@@ -5,7 +5,12 @@
 tempfile=`mktemp 2> /dev/null` || tempfile=/tmp/test$$
 trap "rm -f $tempfile" 0 1 2 5 15
 
-[ -r /usr/share/X11/xkb/rules/evdev.lst -a -e /etc/X11/xorg.conf.d/90-inputclass-setting.conf ] || exit 0
+#conf_key=XkbLayout
+conf_key=xkb_layout
+#conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf
+conf_file=/etc/X11/xorg.conf.d/90-inputclass-setting.conf
+
+[ -r /usr/share/X11/xkb/rules/evdev.lst -a -e $conf_file ] || exit 0
 
 list_keymaps(){
     LN1=`expr $(grep -n "^! layout" /usr/share/X11/xkb/rules/evdev.lst | cut -d : -f 1) + 1`
@@ -30,9 +35,9 @@ choice=`cat $tempfile`
 case $retval in
     0)
 	if [ -z $choice ]; then
-	    sed -i "s%.*Option.*\"xkb_layout\".*%#    Option \"xkb_layout\" \"us\"%" /etc/X11/xorg.conf.d/90-inputclass-setting.conf
+	    sed -i "s%.*Option.*\"$conf_key\".*%#    Option \"$conf_key\" \"us\"%" $conf_file
 	else
-	    sed -i "s%.*Option.*\"xkb_layout\".*%    Option \"xkb_layout\" \"$choice\"%" /etc/X11/xorg.conf.d/90-inputclass-setting.conf
+	    sed -i "s%.*Option.*\"$conf_key\".*%    Option \"$conf_key\" \"$choice\"%" $conf_file
 	fi
     ;;
     1)
-- 
2.11.4.GIT