From b489f37a1bd19f140f869f980a453dd8b276344d Mon Sep 17 00:00:00 2001
From: Luke <luke@lukesmith.xyz>
Date: Wed, 27 Sep 2017 09:14:13 -0700
Subject: [PATCH] Minor fixes

---
 root.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
 user.sh |  0
 2 files changed, 47 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 root.sh
 mode change 100644 => 100755 user.sh

diff --git a/root.sh b/root.sh
old mode 100644
new mode 100755
index b7abbdd..d32a7c2
--- a/root.sh
+++ b/root.sh
@@ -27,15 +27,17 @@ echo "$USER:$(cat pass1)" | chpasswd
 shred -u pass1
 shred -u pass2
 
-cmd=(dialog --separate-output --checklist "Select options:" 22 76 16)
-options=(1 "LaTeX packages" off    # any option can be set to default to "on"
+cmd=(dialog --separate-output --checklist "Select additional packages to install with <SPACE>:" 22 76 16)
+options=(1 "LaTeX packages" off
          2 "Libreoffice Suite" off
          3 "GIMP" off
-         4 "Blender" off)
+         4 "Blender" off
+	 5 "Emacs" off
+	 6 "Fonts for Asian languages and emojis" off)
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
 clear
 printf "\n${BLUE}Now installing main programs.\n${NC}"
-pacman --noconfirm --needed -S base-devel xorg-xinit xorg-server rxvt-unicode feh ffmpeg pulseaudio pulseaudio-alsa arandr pavucontrol pamixer mpv wget rofi vim w3m ranger mediainfo poppler highlight tmux calcurse htop newsbeuter mpd mpc ncmpcpp network-manager-applet networkmanager qutebrowser imagemagick transmission-cli atool libcaca compton transset-df markdown mupdf evince rsync git youtube-dl youtube-viewer noto-fonts-cjk noto-fonts-emoji cups screenfetch scrot unzip unrar ntfs-3g offlineimap msmtp notmuch notmuch-mutt dosfstools fzf r
+pacman --noconfirm --needed -S base-devel xorg-xinit xorg-server rxvt-unicode feh ffmpeg pulseaudio pulseaudio-alsa arandr pavucontrol pamixer mpv wget rofi vim w3m ranger mediainfo poppler highlight tmux calcurse htop newsbeuter mpd mpc ncmpcpp network-manager-applet networkmanager imagemagick transmission-cli atool libcaca compton transset-df markdown mupdf evince rsync git youtube-dl youtube-viewer cups screenfetch scrot unzip unrar ntfs-3g offlineimap msmtp notmuch notmuch-mutt dosfstools fzf r pandoc
 for choice in $choices
 do
     case $choice in
@@ -55,6 +57,44 @@ do
 	    printf "\n${BLUE}Now installing Blender...\n${NC}"
 	    pacman --noconfirm --needed -S blender
             ;;
+    5)
+	    printf "\n${BLUE}Now installing Emacs...\n${NC}"
+	    pacman --noconfirm --needed -S emacs
+	    ;;
+    6)
+	    printf "\n${BLUE}Now installing extra fonts...\n${NC}"
+	    pacman --noconfirm --needed -S noto-fonts-cjk noto-fonts-emoji
+	    ;;
+    esac
+done
+
+brow=(dialog --separate-output --checklist "Select a browser (none or multiple possible):" 22 76 16)
+options=(1 "qutebrowser" off    # any option can be set to default to "on"
+         2 "Firefox" off
+         #3 "Palemoon" off
+         #4 "Firefox" off
+	 )
+browch=$("${brow[@]}" "${options[@]}" 2>&1 >/dev/tty)
+clear
+for choice in $browch
+do
+    case $choice in
+        1)
+	    printf "\n${BLUE}Now installing qutebrowser...\n${NC}"
+	    pacman --noconfirm --needed -S qutebrowser gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+            ;;
+        2)
+	    printf "\n${BLUE}Now installing Firefox...\n${NC}"
+	    pacman --noconfirm --needed -S firefox
+            ;;
+        3)
+	    printf "\n${BLUE}Now installing Palemoon...\n${NC}"
+	    pacman --noconfirm --needed -S palemoon-bin
+            ;;
+        4)
+	    printf "\n${BLUE}Now installing Waterfox...\n${NC}"
+	    pacman --noconfirm --needed -S waterfox-bin
+            ;;
     esac
 done
 
@@ -72,6 +112,7 @@ cp /etc/sudoers /etc/sudoers.prelarbs
 echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 sudo -u $USER bash /home/$USER/user.sh
 
-echo -e "root ALL=(ALL) ALL\n%wheel ALL=(ALL) ALL\n%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/packer -Syu,/usr/bin/packer -Syyu,/usr/bin/systemctl restart NetworkManager\nDefaults !tty_tickets"
+echo -e "root ALL=(ALL) ALL\n%wheel ALL=(ALL) ALL\n%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/packer -Syu,/usr/bin/packer -Syyu,/usr/bin/systemctl restart NetworkManager\nDefaults !tty_tickets" > /etc/sudoers
 
-dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\n\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\n\n-Luke" 20 80
+dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\n\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\n\n-Luke" 12 80
+clear
diff --git a/user.sh b/user.sh
old mode 100644
new mode 100755