From 03212458a602fd8cb1c16ae095d272807530a471 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 30 Sep 2017 00:45:54 -0400 Subject: [PATCH] AUR optionality added --- README.md | 2 +- root.sh | 10 ++++++++-- user.sh | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5813c9d..bee4ac8 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ I've also documented the configuration fairly well, check out the documentation ## What do you get? -[My dotfiles](https://github.com/lukesmithxyz/voidrice) and all their requisite programs installed without a problem. +[My dotfiles](https://github.com/lukesmithxyz/voidrice) and all their requisite programs installed without a problem. Effectively, this is an Arch Linux ricing desktop environment. All the core stuff we be installed without prompt, but you'll have the option to install some of the larger non-essential packages (LaTeX, LibreOffice, Blender, etc.). diff --git a/root.sh b/root.sh index 4eed36e..3e8e0a7 100755 --- a/root.sh +++ b/root.sh @@ -34,12 +34,15 @@ options=(1 "LaTeX packages" off 3 "GIMP" off 4 "Blender" off 5 "Emacs" off - 6 "Fonts for Asian languages and emojis" off) + 6 "Fonts for unicode and other languages" off + 7 "transmission torrent client" off + ) choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) +echo $choices > /home/$USER/choices 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 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 || (echo "Error installing basic packages. Check your internet connection and pacman keyring." >> LARBS.log && error) +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) for choice in $choices do @@ -68,6 +71,9 @@ do printf "\n${BLUE}Now installing extra fonts...\n${NC}" pacman --noconfirm --needed -S noto-fonts-cjk noto-fonts-emoji ;; + 7) + printf "\n${BLUE}Now installing transmission...\n${NC}" + pacman --noconfirm --needed -S transmission-cli esac done diff --git a/user.sh b/user.sh index cef94ca..d098a02 100755 --- a/user.sh +++ b/user.sh @@ -17,8 +17,26 @@ aurinstall packer || echo "Error installing packer." && exit printf "${BLUE}Installing AUR programs...\n${NC}" printf "${BLUE}(May take some time.)\n${NC}" -packer --noconfirm -S i3-gaps vim-pathogen vim-live-latex-preview neofetch i3lock tamzen-font-git neomutt transmission-remote-cli-git unclutter-xfixes-git urxvt-resize-font-git ttf-ancient-fonts polybar-git python-pywal xfce-theme-blackbird || echo "Error installing AUR packages. Check your internet connections and pacman keys." && exit +packer --noconfirm -S 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." && exit #packer --noconfirm -S ncpamixer-git speedometer cli-visualizer +choices=$(cat choices) +for choice in $choices +do + case $choice in + 1) + printf "\n${BLUE}Now installing LaTeX packages...\n${NC}" + packer --noconfirm -S vim-live-latex-preview + ;; + 6) + printf "\n${BLUE}Now installing extra fonts...\n${NC}" + pacman --noconfirm --needed -S ttf-ancient-fonts + ;; + 7) + printf "\n${BLUE}Now installing transmission-remote-cli...\n${NC}" + packer --noconfirm -S transmission-remote-cli-git + ;; + esac +done printf "${BLUE}Downloading config files...\n${NC}" git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$USER && rm -rf voidrice