diff options
| -rwxr-xr-x | bin/aurinstall | 13 | ||||
| -rwxr-xr-x | bin/aurremove | 31 | ||||
| -rwxr-xr-x | install.sh | 3 | ||||
| -rwxr-xr-x | shell_only.sh | 15 |
4 files changed, 7 insertions, 55 deletions
diff --git a/bin/aurinstall b/bin/aurinstall deleted file mode 100755 index 441ce2c..0000000 --- a/bin/aurinstall +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/bash - -set -e - -# Get all arguments excluding the last one -ARGSLEN=$(($#-1)) -ARGS=${@:1:${ARGSLEN}} - -# Get last argument -for LAST; do true; done - -git clone https://aur.archlinux.org/${LAST}.git ~/aur/${LAST} -(cd ~/aur/${LAST} && makepkg -si ${ARGS}) diff --git a/bin/aurremove b/bin/aurremove deleted file mode 100755 index 868ea7a..0000000 --- a/bin/aurremove +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/bash - -set -e - -function command_exists { - command -v $1 &> /dev/null -} - -if [ ${UID} -ne 0 ]; then - if command_exists doas; then - SUDO="doas" - elif command_exists sudo; then - SUDO="sudo" - else - echo "Requires doas or sudo to be installed." - exit 1 - fi -fi - -# Get all arguments excluding the lastone -ARGSLEN=$(($#-1)) -ARGS=${@:1:${ARGSLEN}} - -# Get last argument -for LAST; do true; done - -${SUDO} pacman -R ${ARGS} ${LAST} - -# Need write permissions to delete without root privileges -chmod -R u+w ~/aur/${LAST} -rm -rf ~/aur/${LAST} @@ -70,8 +70,7 @@ if command_exists pacman; then pavucontrol \ chafa - bin/aurinstall --noconfirm cava - bin/aurinstall --noconfirm i3lock-fancy-rapid-git + paru -S --noconfirm cava i3lock-fancy-rapid-git elif command_exists apt; then ${SUDO} apt install -y gnupg gcc cmake g++ pkg-config libfontconfig1-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev diff --git a/shell_only.sh b/shell_only.sh index 50c2230..a30aea7 100755 --- a/shell_only.sh +++ b/shell_only.sh @@ -63,10 +63,13 @@ if command_exists pacman; then openssh \ paru - mkdir -p ~/aur/ + mkdir -p ~/.config/paru/ + cat <<EOT > ~/.config/paru/paru.conf +[bin] +Sudo = $(which ${SUDO}) +EOT - bin/aurinstall --noconfirm c-lolcat - bin/aurinstall --noconfirm tty-clock-git + paru -S --noconfirm c-lolcat tty-clock-git elif command_exists apt; then ${SUDO} apt update ${SUDO} apt install -y \ @@ -109,12 +112,6 @@ ln -sf ${PWD}/vimrc ~/.vimrc mkdir -p ~/.oh-my-zsh/ ln -sf ${PWD}/himbeer.zsh-theme ~/.oh-my-zsh/themes/himbeer.zsh-theme -mkdir -p ~/.config/paru/ -cat <<EOT > ~/.config/paru/paru.conf -[bin] -Sudo = $(which ${SUDO}) -EOT - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source ~/.cargo/env |