From 961f2c85d0e52a1612a9276c4776ae528954a023 Mon Sep 17 00:00:00 2001
From: geeflaxx <patrick-seemann@hotmail.de>
Date: Sun, 12 Apr 2020 22:42:23 +0200
Subject: [PATCH 1/2] nano

---
 qdarch/doinchroot.sh | 38 +++++++++++++++++++-------------------
 qdarch/quick.sh      | 26 +++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/qdarch/doinchroot.sh b/qdarch/doinchroot.sh
index 82baad7..4d40510 100644
--- a/qdarch/doinchroot.sh
+++ b/qdarch/doinchroot.sh
@@ -1,17 +1,17 @@
 #! /bin/bash
 
 #username
-USERNAME='you'
+#USERNAME='you'
 #locale
-set_locale='0'       # 0=em_US ; 1=de_DE
+#set_locale='0'       # 0=em_US ; 1=de_DE
 #wm
-set_wm='0'          # 0=nope ; 1=i3-wm ; 2=plasma
+#set_wm='0'          # 0=nope ; 1=i3-wm ; 2=plasma
 #gpu
-set_xf86_video='0'  # 0=intel ; 1=amd
+#set_xf86_video='0'  # 0=intel ; 1=amd
 
 
 
-case $set_locale in
+case $lang in
   "1")
     echo "de_DE.UTF-8 UTF-8" >> /etc/locale.gen
     echo "de_DE ISO-8859-1" >> /etc/locale.gen
@@ -49,7 +49,7 @@ systemctl enable org.cups.cupsd.service
 ntpd -gq
 pacman -S xorg-server xorg-xinit xorg-apps --noconfirm
 
-case $set_xf86_video in
+case $video in
   "0") pacman -S xf86-video-intel --noconfirm;;
   "1") pacman -S xf86-video-amdgpu --noconfirm;;
 esac
@@ -74,10 +74,10 @@ pacman -S alsa alsa-utils pulseaudio sudo --noconfirm
 pacman -S wpa_supplicant netctl dialog --noconfirm
 
 #usermake
-useradd -m -g users -s /bin/bash $USERNAME
-gpasswd -a $USERNAME wheel
-echo "$USERNAME passwort:"
-passwd $USERNAME
+useradd -m -g users -s /bin/bash $username
+gpasswd -a $username wheel
+echo "$username passwort:"
+passwd $username
 #echo "setxkbmap de" >> /home/$USERNAME/.bashrc
 
 #other stuff
@@ -85,25 +85,25 @@ pacman -S cdrtools gedit screenfetch firefox openssh transmission-gtk htop cpupo
 
 #Virtualbox
 pacman -S virtualbox virtualbox-host-modules-arch --noconfirm
-gpasswd -a $USERNAME vboxusers
+gpasswd -a $username vboxusers
 
 #fastboot android
 #pacman -S fastboot --noconfirm
 
 
-case $set_wm in
+case $desktop in
   *) echo 'nope';;
   
   "1") #i3-wm
     pacman -S i3 feh ttf-dejavu scrot thunar file-roller i3lock gvfs conky --noconfirm
     echo "exec i3" >> ~/.xinitrc
-    cp ~/.xinitrc /home/$USERNAME/.xinitrc
-    mkdir /home/$USERNAME/.config
-    mkdir /home/$USERNAME/.config/i3
-    cp /root/installer/i3 /home/$USERNAME/.config/i3/config
-    cp /root/installer/conky.conf /home/$USERNAME/conky.conf
-    chown $USERNAME:users /home/$USERNAME/.config
-    chmod 770 /home/$USERNAME/.config;;
+    cp ~/.xinitrc /home/$username/.xinitrc
+    mkdir /home/$username/.config
+    mkdir /home/$username/.config/i3
+    cp /root/installer/i3 /home/$username/.config/i3/config
+    cp /root/installer/conky.conf /home/$usernameE/conky.conf
+    chown $username:users /home/$username/.config
+    chmod 770 /home/$username/.config;;
     
   "2") #plasma
     #stuff
diff --git a/qdarch/quick.sh b/qdarch/quick.sh
index c9abe96..d8a12e7 100644
--- a/qdarch/quick.sh
+++ b/qdarch/quick.sh
@@ -1,7 +1,21 @@
-#!/bin/bash
+#! /bin/bash
+
+
+read -p "Enter your username:" username
+ 
+read -p "Enter your password:" password
+
+read -p "Which desktop-environment do you want? ( 0=nothing ; 1=i3-wm ; 2=plasma )" desktop 
+
+read -p "Which grafikcard do you have? ( nvidia=0 ; amd=1 )" video
+
+read -p "Which language do you speak? ( 0=en ; 1=de )" lang
 
 wifi-menu
 
+
+
+echo "Bitte Festplatte in zwei Partitionen splitten"
 #cfdisk /dev/$SYSDISK
 cfdisk /dev/sda
 
@@ -38,10 +52,16 @@ syslinux-install_update -i -a -m -c /mnt
 #sed s/sysdisk/$ROOT/g syslinux.cfg > /mnt/boot/syslinux/syslinux.cfg
 sed s/sysdisk/sda2/g syslinux.cfg > /mnt/boot/syslinux/syslinux.cfg
 
+export username
+export password
+export desktop
+export lang
+export graka
+
 cp -r /root/qdarch /mnt/root/installer
 
 arch-chroot /mnt /bin/bash -c '/root/installer/doinchroot.sh'
 
-echo "################"
+echo "############################################################"
 echo "REBOOT NOW!"
-echo "################"
+echo "#############################################################"

From cb3ed7650d4646a909a47119b97a583cacf9a575 Mon Sep 17 00:00:00 2001
From: geeflaxx <patrick-seemann@hotmail.de>
Date: Sun, 12 Apr 2020 22:43:41 +0200
Subject: [PATCH 2/2] +eingabe aufforderung +variable

---
 qdarch/quick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qdarch/quick.sh b/qdarch/quick.sh
index d8a12e7..5d78284 100644
--- a/qdarch/quick.sh
+++ b/qdarch/quick.sh
@@ -7,7 +7,7 @@ read -p "Enter your password:" password
 
 read -p "Which desktop-environment do you want? ( 0=nothing ; 1=i3-wm ; 2=plasma )" desktop 
 
-read -p "Which grafikcard do you have? ( nvidia=0 ; amd=1 )" video
+read -p "Which grafikcard do you have? ( nvidia=0 ; amd=1 )" graka
 
 read -p "Which language do you speak? ( 0=en ; 1=de )" lang