aurora38e5a0b
remove redundant paru install
+7 −17
1 file changed
- M install.sh +7 −17
| @@ -174,6 +174,7 @@ else | |||
| 174 | 174 | gum_to_array GPU_PKGS < <(choose_packages pkg_gpu) | |
| 175 | 175 | fi | |
| 176 | 176 | ||
| 177 | + | ||
| 177 | 178 | ################## | |
| 178 | 179 | ## AUR PACKAGES ## | |
| 179 | 180 | ################## | |
| @@ -252,9 +253,6 @@ fi | |||
| 252 | 253 | ||
| 253 | 254 | ||
| 254 | 255 | ||
| 255 | − | ######################## | |
| 256 | − | ## Install Everything ## | |
| 257 | − | ######################## | |
| 258 | 256 | source "$currentDir/packages/pkg_desktop.sh" | |
| 259 | 257 | ALL_PKGS=( | |
| 260 | 258 | "${DEV_PKGS[@]}" | |
| @@ -265,6 +263,9 @@ ALL_PKGS=( | |||
| 265 | 263 | "${pkg_desktop[@]}" | |
| 266 | 264 | ) | |
| 267 | 265 | ||
| 266 | + | ######################## | |
| 267 | + | ## Install Everything ## | |
| 268 | + | ######################## | |
| 268 | 269 | if ((${#ALL_PKGS[@]})); then | |
| 269 | 270 | if confirm "Install all the selected packages?"; then | |
| 270 | 271 | log INFO "Installing selected packages..." | |
| @@ -292,20 +293,6 @@ else | |||
| 292 | 293 | fi | |
| 293 | 294 | ||
| 294 | 295 | ||
| 295 | − | ########################## | |
| 296 | − | ## Install AUR Packages ## | |
| 297 | − | ########################## | |
| 298 | − | if ((${#AUR_PKGS[@]})); then | |
| 299 | − | if ! command -v paru >/dev/null 2>&1; then | |
| 300 | − | log INFO "Installing Paru (AUR package manager)" | |
| 301 | − | git clone https://aur.archlinux.org/paru.git | |
| 302 | − | (cd paru && makepkg -sri) | |
| 303 | − | rm -rf paru | |
| 304 | − | fi | |
| 305 | − | paru -S --needed "${AUR_PKGS[@]}" | |
| 306 | − | else | |
| 307 | − | log WARN "No AUR packages selected" | |
| 308 | − | fi | |
| 309 | 296 | ||
| 310 | 297 | ################ | |
| 311 | 298 | ## Setup Keyd ## | |
| @@ -321,6 +308,9 @@ if command -v keyd >/dev/null 2>&1; then | |||
| 321 | 308 | fi | |
| 322 | 309 | ||
| 323 | 310 | ||
| 311 | + | #################### | |
| 312 | + | ## Final dialogue ## | |
| 313 | + | #################### | |
| 324 | 314 | case "$INSTALL_STATUS" in | |
| 325 | 315 | complete) | |
| 326 | 316 | gum style \ | |