From aa1f727f5ac8787eaf34b10d8d4a1fe7011d1de2 Mon Sep 17 00:00:00 2001 From: srdusr Date: Thu, 20 Jun 2024 17:46:07 +0200 Subject: Testing --- install.sh | 6 ++---- packages.yml | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index edf8a83..329ce24 100755 --- a/install.sh +++ b/install.sh @@ -566,9 +566,6 @@ linux_install_packages() { fi # Read the package manager type detected by _distro_detect() - echo "Detected distribution: $_distro" - echo "Packages to install: ${packages[@]}" - case "$_distro" in "PACMAN") # Installation using Pacman @@ -616,7 +613,7 @@ linux_install_packages() { ;; "PORTAGE") # Try installing packages with emerge for Gentoo - local gentoo_packages=("$(yq e '.linux.gentoo[]' "$packages_file" 2>/dev/null | grep -v '^$')") + local gentoo_packages=("$(yq e '.gentoo[]' "$packages_file" 2>/dev/null)") for package in "${gentoo_packages[@]}"; do if [ "$package" != "" ]; then if ! equery list "$package" &>/dev/null; then @@ -634,6 +631,7 @@ linux_install_packages() { ;; esac + # Check if any packages failed to install if "$any_failures"; then echo "Failed to install the following packages:" printf '%s\n' "${failed_packages[@]}" diff --git a/packages.yml b/packages.yml index 8bfa4c8..da03db2 100644 --- a/packages.yml +++ b/packages.yml @@ -154,7 +154,6 @@ PackageManager: rust: - matugen -linux: [] arch: - dkms - linux -- cgit v1.2.3