remove redundant paru install
This commit is contained in:
parent
4ddf45c07f
commit
38e5a0be3b
24
install.sh
24
install.sh
|
|
@ -174,6 +174,7 @@ else
|
||||||
gum_to_array GPU_PKGS < <(choose_packages pkg_gpu)
|
gum_to_array GPU_PKGS < <(choose_packages pkg_gpu)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
## AUR PACKAGES ##
|
## AUR PACKAGES ##
|
||||||
##################
|
##################
|
||||||
|
|
@ -252,9 +253,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
########################
|
|
||||||
## Install Everything ##
|
|
||||||
########################
|
|
||||||
source "$currentDir/packages/pkg_desktop.sh"
|
source "$currentDir/packages/pkg_desktop.sh"
|
||||||
ALL_PKGS=(
|
ALL_PKGS=(
|
||||||
"${DEV_PKGS[@]}"
|
"${DEV_PKGS[@]}"
|
||||||
|
|
@ -265,6 +263,9 @@ ALL_PKGS=(
|
||||||
"${pkg_desktop[@]}"
|
"${pkg_desktop[@]}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
########################
|
||||||
|
## Install Everything ##
|
||||||
|
########################
|
||||||
if ((${#ALL_PKGS[@]})); then
|
if ((${#ALL_PKGS[@]})); then
|
||||||
if confirm "Install all the selected packages?"; then
|
if confirm "Install all the selected packages?"; then
|
||||||
log INFO "Installing selected packages..."
|
log INFO "Installing selected packages..."
|
||||||
|
|
@ -292,20 +293,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
##########################
|
|
||||||
## Install AUR Packages ##
|
|
||||||
##########################
|
|
||||||
if ((${#AUR_PKGS[@]})); then
|
|
||||||
if ! command -v paru >/dev/null 2>&1; then
|
|
||||||
log INFO "Installing Paru (AUR package manager)"
|
|
||||||
git clone https://aur.archlinux.org/paru.git
|
|
||||||
(cd paru && makepkg -sri)
|
|
||||||
rm -rf paru
|
|
||||||
fi
|
|
||||||
paru -S --needed "${AUR_PKGS[@]}"
|
|
||||||
else
|
|
||||||
log WARN "No AUR packages selected"
|
|
||||||
fi
|
|
||||||
|
|
||||||
################
|
################
|
||||||
## Setup Keyd ##
|
## Setup Keyd ##
|
||||||
|
|
@ -321,6 +308,9 @@ if command -v keyd >/dev/null 2>&1; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
####################
|
||||||
|
## Final dialogue ##
|
||||||
|
####################
|
||||||
case "$INSTALL_STATUS" in
|
case "$INSTALL_STATUS" in
|
||||||
complete)
|
complete)
|
||||||
gum style \
|
gum style \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue