Fixed bugs
Added paru installation Switchted to hyprlock
This commit is contained in:
32
install.sh
32
install.sh
@@ -19,20 +19,42 @@ print_header() {
|
||||
cmd() {
|
||||
local DOTFILES_LOG="./error.log"
|
||||
|
||||
if ! [[ -f $DOTFILES_LOG ]]; then
|
||||
touch $DOTFILES_LOG
|
||||
fi
|
||||
|
||||
if eval "$1" 1> /dev/null 2> $DOTFILES_LOG; then
|
||||
rm "$DOTFILES_LOG"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo -e "${RED}"
|
||||
cat $DOTFILES_LOG
|
||||
echo -e "${COLOR_RESET}"
|
||||
rm "$DOTFILES_LOG"
|
||||
exit 1
|
||||
}
|
||||
|
||||
paru_install() {
|
||||
if [ -x "$(command -v paru)" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
# Install Base-Devel
|
||||
if [ -z "$(pacman -Q | grep base-devel)" ]; then
|
||||
print_header "Installing base-devel"
|
||||
cmd "sudo pacman -S base-devel --noconfirm"
|
||||
fi
|
||||
# Install RustUp
|
||||
if ! [ -x "$(command -v rustup)" ]; then
|
||||
print_header "Installing rustup"
|
||||
cmd "sudo pacman -S rustup --noconfirm"
|
||||
cmd "rustup default stable"
|
||||
fi
|
||||
# Instal Paru
|
||||
FOLDER=$(mktemp -d)
|
||||
print_header "Installing paru"
|
||||
cmd "git clone https://aur.archlinux.org/paru.git $FOLDER"
|
||||
cd $FOLDER
|
||||
cmd "makepkg -si --noconfirm"
|
||||
}
|
||||
|
||||
arch_install() {
|
||||
# Install Ansible
|
||||
if ! [ -x "$(command -v ansible)" ]; then
|
||||
@@ -44,6 +66,8 @@ arch_install() {
|
||||
print_header "Installing git"
|
||||
cmd "sudo pacman -S git --noconfirm"
|
||||
fi
|
||||
# Installl Paru
|
||||
paru_install
|
||||
# Install PIP
|
||||
if ! [ -x "$(command -v pip)" ]; then
|
||||
print_header "Installing pip"
|
||||
|
||||
Reference in New Issue
Block a user