From: paperbenni <paperbenni@gmail.com>
Date: Fri, 31 Jul 2020 14:19:17 +0000 (+0200)
Subject: add gxkb to ilayout
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=76193cb6612c79134ec71e76e578a1c1e948046f;p=instantos%2FinstantOS.git

add gxkb to ilayout
---

diff --git a/programs/ilayout b/programs/ilayout
index db0a190..987c80a 100755
--- a/programs/ilayout
+++ b/programs/ilayout
@@ -22,6 +22,38 @@ else
 
 fi
 
+# convert layout selection to applet
+if [ "$1" = "apply" ]; then
+    pgrep gxkb && RESTARTAPPLET=true
+    if [ -e ~/.config/gxkb/gxkb.cfg ] && grep '^layout' ~/.config/gxkb/gxkb.cfg; then
+        echo "gxkb config found"
+    else
+        echo "initiating gxkb config"
+        pgrep gxkb || gxkb &
+        for i in {1..15}; do
+            echo "waiting for config: $i"
+            sleep 2
+            if [ -e ~/.config/gxkb/gxkb.cfg ]; then
+                pkill gxkb
+                break
+            fi
+        done
+    fi
+
+    echo "applying layouts to gxkb"
+    LAYOUTS="$(tr '\n' ',' <~/.config/instantos/layouts | grep -o '.*[^,]')"
+    echo "setting layouts to $LAYOUTS"
+
+    if [ -n "$RESTARTAPPLET" ]; then
+        echo "restartring gxkb"
+        pkill gxkb
+        sleep 2
+        gxkb &
+    fi
+
+    exit
+fi
+
 # layout list editor
 while :; do
     LIST=">>h Keyboard layouts
diff --git a/rootinstall.sh b/rootinstall.sh
index 5811081..168d1b4 100755
--- a/rootinstall.sh
+++ b/rootinstall.sh
@@ -4,7 +4,7 @@
 ## installs all system wide tweaks for instantOS  ##
 ####################################################
 
-if ! [ $(whoami) = "root" ]; then
+if ! [ "$(whoami)" = "root" ]; then
     echo "please run this as root"
     exit 1
 fi