From ed3f410191682898d2cd5ea1cd71b92e264fdcaf Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Sun, 8 Mar 2020 22:01:47 +0100
Subject: [PATCH] fix syntax errors and ignore x11 stuff when installing
 minimal editions

---
 manjaro-arm-installer | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index e55ba33..28d1120 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -180,11 +180,13 @@ create_install() {
     echo "LANG=$LOCALE" | tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root locale-gen
     echo "KEYMAP=$CLIKEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
+    if [[ "$EDITION" != "minimal" ]]; then
     echo 'Section "InputClass"' > $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     echo 'Identifier "system-keyboard"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     echo 'Option "XkbLayout" "us"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     echo 'EndSection' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     sed -i s/"us"/"$X11KEYMAP"/ $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    fi
     echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
     sed -i s/"enable systemd-resolved.service"/"#enable systemd-resolved.service"/ $TMPDIR/root/usr/lib/systemd/system-preset/90-systemd.preset
 
@@ -235,7 +237,6 @@ prepare_card () {
         mkdir -p $TMPDIR/boot
         mount ${SDCARD}${SDDEV}1 $TMPDIR/boot
         mount ${SDCARD}${SDDEV}2 $TMPDIR/root
-    fi
 }
 
 cleanup () {
@@ -490,6 +491,7 @@ else
 	exit 1
 fi
 
+if [[ "$EDITION" != "minimal" ]]; then
 if [ ! -z "$CLIKEYMAP" ]; then
 	let i=0
 	W=()
@@ -505,8 +507,9 @@ else
 	clear
 	exit 1
 fi
+fi
 
-if [ ! -z "$X11KEYMAP" ]; then
+if [ ! -z "$CLIKEYMAP" ]; then
 	HOSTNAME=$(dialog --clear --title "Manjaro ARM Installer" \
 	--inputbox "Enter desired hostname for this system:" 8 50 \
 	3>&1 1>&2 2>&3 3>&- \