larbs

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 4f762537f704900683cae4ffc0aea58039628f40
parent 1f6bf8f893e90a1feea1fa826d48d9365227ad24
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Sat,  3 Mar 2018 00:21:16 -0700

fixes

Diffstat:
Msrc/larbs.sh | 12++++++------
Msrc/progs.csv | 4++--
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/larbs.sh b/src/larbs.sh @@ -18,12 +18,12 @@ do done dialog --infobox "Adding user \"$name\"..." 4 50 -useradd -m -g wheel -s /bin/bash $name -echo "$name:$pass1" | chpasswd +useradd -m -g wheel -s /bin/bash $name >/dev/tty6 +echo "$name:$pass1" | chpasswd >/dev/tty6 cmd=(dialog --separate-output --nocancel --buildlist "Press <SPACE> to select the packages you want to install. LARBS will install all the packages you put in the right column. -Use `^` and `$` to move to the left and right columns respectively. Press <ENTER> when done." 22 76 16) +Use \"^\" and \"\$\" to move to the left and right columns respectively. Press <ENTER> when done." 22 76 16) options=(X "LaTeX packages" off L "Libreoffice" off G "GIMP" off @@ -34,11 +34,11 @@ options=(X "LaTeX packages" off D "Music visualizers and decoration" off P "Pandoc for document management" off ) -choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty6) +choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) let="\(\|[a-z]\|$(echo $choices | sed -e "s/ /\\\|/g")\)" -dialog --title "Let's get this party started!" --msgbox "The rest of the installation will now be totally automated, so you can sit back and relax.\n\nIt will take some time, but when done, you can relax even more with your complete system.\n\nNow just press <OK> and the system will begin installation!" 13 60 || clear && exit +dialog --title "Let's get this party started!" --msgbox "The rest of the installation will now be totally automated, so you can sit back and relax.\n\nIt will take some time, but when done, you can relax even more with your complete system.\n\nNow just press <OK> and the system will begin installation!" 13 60 || (clear && exit) clear @@ -55,7 +55,7 @@ installProgram() { ( (pacman --noconfirm --needed -S $1 &>/dev/tty6 && echo $1 i for x in $(cat /tmp/progs.csv | grep -G ",$let," | awk -F, {'print $1'}) do n=$((n+1)) - dialog --infobox "Downloading and installing program $n out of $count: $x..." 10 60 + dialog --title "LARBS Installation" --infobox "Downloading and installing program $n out of $count: $x...\n\nThe first programs will take more time due to dependencies. You can watch the output on tty6." 8 70 installProgram $x >/dev/tty6 done diff --git a/src/progs.csv b/src/progs.csv @@ -9,7 +9,7 @@ calcurse,,calendar, cli-visualizer,D,music/audio visualizer, cmatrix,D,terminal screensaver, compton,,transparency and removing tearing, -discount,,, +discount,?,, dosfstools,,file system compatibility, emacs,E,everything, exfat-utils,,file system compatibility, @@ -20,7 +20,7 @@ gimp,G,image modification, git,,dling config repos, gnome-keyring,,system keyring, highlight,r,ranger previews highlighted, -htop-vim-git,,system info, +htop-vim-git,D,system info, i3-gaps,,window manager, i3lock,,screen lock, imagemagick,,"image conversion and modification, lock screen",