larbs

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

commit 95df15576bb2c198dfd17479e9e62cd932629462
parent 3a3560879ee3bb7c744e0c4944e9faa6211aad0d
Author: Luke <luke@lukesmith.xyz>
Date:   Thu,  5 Oct 2017 01:58:36 -0700

AUR install fix

Diffstat:
Mroot.sh | 3+++
Muser.sh | 15++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/root.sh b/root.sh @@ -51,6 +51,9 @@ browch=$("${brow[@]}" "${options[@]}" 2>&1 >/dev/tty) echo $browch > /home/$USER/browch clear +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'll can relax even more with your complete system.\n\nNow just press <OK> and the system will begin installation!" 13 60 + + 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 imagemagick 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 || (echo "Error installing basic packages. Check your internet connection and pacman keyring." >> LARBS.log && error) diff --git a/user.sh b/user.sh @@ -15,21 +15,26 @@ printf "${BLUE}Installing packer as an AUR manager...\n${NC}" aurinstall() { curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/$1.tar.gz && tar -xvf $1.tar.gz && cd $1 && makepkg --noconfirm -si && cd .. && rm -rf $1 $1.tar.gz ;} qm=$(pacman -Qm | awk '{print $1}') - aurcheck() { -if [[ $qm = *"$1"* ]]; then - echo $1 already installed. +for arg in "$@" +do +if [[ $qm = *"$arg"* ]]; then + echo $arg already installed. else - aurinstall $1 + echo $arg not installed + aurinstall $arg fi +done } - aurcheck packer || (echo "Error installing packer." >> LARBS.log && error) printf "${BLUE}Installing AUR programs...\n${NC}" printf "${BLUE}(May take some time.)\n${NC}" + aurcheck i3-gaps vim-pathogen neofetch i3lock tamzen-font-git neomutt unclutter-xfixes-git urxvt-resize-font-git polybar-git python-pywal xfce-theme-blackbird || (echo "Error installing AUR packages. Check your internet connections and pacman keys." >> LARBS.log && error) + #packer --noconfirm -S ncpamixer-git speedometer cli-visualizer + choices=$(cat choices) for choice in $choices do