correction

This commit is contained in:
2024-05-24 09:46:20 -05:00
parent 7e69257fd5
commit b651eb4eb5
+46 -25
View File
@@ -74,30 +74,46 @@ checkEnv() {
installDepend() {
## Check for dependencies.
DEPENDENCIES='bash bash-completion tar neovim bat tree multitail fastfetch'
DEPENDENCIES='bash bash-completion tar neovim bat tree multitail'
echo -e "${YELLOW}Installing dependencies...${RC}"
if [ "$PACKAGER" = "pacman" ]; then
if ! command_exists yay && ! command_exists paru; then
echo "Installing yay as AUR helper..."
sudo pacman --noconfirm -S base-devel
cd /opt && sudo git clone https://aur.archlinux.org/yay-git.git && sudo chown -R "${USER}:${USER}" ./yay-git
cd yay-git && makepkg --noconfirm -si
else
echo "Aur helper already installed"
fi
if command_exists yay; then
AUR_HELPER="yay"
elif command_exists paru; then
AUR_HELPER="paru"
else
echo "No AUR helper found. Please install yay or paru."
exit 1
fi
"${AUR_HELPER}" --noconfirm -S ${DEPENDENCIES}
elif [ "$PACKAGER" = "nala" ] || [ "$PACKAGER" = "apt" ]; then
sudo "$PACKAGER" install -y ${DEPENDENCIES}
if [ "$PACKAGER" = "nala" ] || [ "$PACKAGER" = "apt" ]; then
for pkg in $DEPENDENCIES; do
read -p "Would you like to install $pkg package? [Y/n]: " choice
case "$choice" in
y|Y|'') sudo "$PACKAGER" install -y "$pkg" ;;
n|N) ;;
*) echo "Invalid choice. Defaulting to yes." && sudo "$PACKAGER" install -y "$pkg" ;;
esac
done
elif [ "$PACKAGER" = "yum" ] || [ "$PACKAGER" = "dnf" ]; then
for pkg in $DEPENDENCIES; do
read -p "Would you like to install $pkg package? [Y/n]: " choice
case "$choice" in
y|Y|'') sudo "$PACKAGER" install -y "$pkg" ;;
n|N) ;;
*) echo "Invalid choice. Defaulting to yes." && sudo "$PACKAGER" install -y "$pkg" ;;
esac
done
elif [ "$PACKAGER" = "pacman" ]; then
for pkg in $DEPENDENCIES; do
read -p "Would you like to install $pkg package? [Y/n]: " choice
case "$choice" in
y|Y|'') sudo "$PACKAGER" -S --noconfirm "$pkg" ;;
n|N) ;;
*) echo "Invalid choice. Defaulting to yes." && sudo "$PACKAGER" -S --noconfirm "$pkg" ;;
esac
done
elif [ "$PACKAGER" = "zypper" ]; then
for pkg in $DEPENDENCIES; do
read -p "Would you like to install $pkg package? [Y/n]: " choice
case "$choice" in
y|Y|'') sudo "$PACKAGER" install -y "$pkg" ;;
n|N) ;;
*) echo "Invalid choice. Defaulting to yes." && sudo "$PACKAGER" install -y "$pkg" ;;
esac
done
else
sudo "$PACKAGER" install -yq ${DEPENDENCIES}
echo "Unsupported package manager: $PACKAGER"
fi
}
@@ -140,9 +156,14 @@ installFastfetch() {
return
fi
if ! curl -sSL https://github.com/fastfetch-cli/fastfetch/releases/download/2.13.2/fastfetch-linux-amd64.deb -o fastfetch-linux-amd64.deb || ! sudo dpkg -i fastfetch-linux-amd64.deb; then
echo -e "${RED}Something went wrong during fastfetch install${RC}"
exit 1
echo -e "${YELLOW}Installing fastfetch...${RC}"
if [ "$PACKAGER" = "nala" ] || [ "$PACKAGER" = "apt" ]; then
if ! curl -sSL https://github.com/fastfetch-cli/fastfetch/releases/download/2.13.2/fastfetch-linux-amd64.deb -o fastfetch-linux-amd64.deb || ! sudo dpkg -i fastfetch-linux-amd64.deb; then
echo -e "${RED}Something went wrong during fastfetch install${RC}"
exit 1
fi
else
sudo "$PACKAGER" install -y fastfetch
fi
}