From 836700022e295e55bb121e0299409e23c65ca8e9 Mon Sep 17 00:00:00 2001 From: Lightemerald Date: Sat, 15 Mar 2025 22:27:03 +0100 Subject: [PATCH] Updated repo --- arch-setup.sh | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/arch-setup.sh b/arch-setup.sh index 751f09d..0e152d9 100755 --- a/arch-setup.sh +++ b/arch-setup.sh @@ -15,7 +15,7 @@ install_packages() { # Description: Check if whiptail is installed else install it check_whiptail() { if ! command -v whiptail &>/dev/null; then - sudo pacman -S --needed --noconfirm libnewt + sudo pacman -S --needed --noconfirm --asdeps libnewt fi } @@ -23,10 +23,10 @@ check_whiptail() { # Description: Ask the user if they want to add specific repositories add_repositories() { options=( - "BlackArch" "Add BlackArch repository" OFF - "Chaotic.cx" "Add Chaotic.cx repository" OFF "CachyOS" "Add CachyOS repository" OFF - "Chromatic" "Add Chromatic repository" OFF + "Chromatic" "Add Chromatic repository" ON + "BlackArch" "Add BlackArch repository" OFF + "Chaotic.cx" "Add Chaotic.cx repository" ON ) selected_repos=$(whiptail --title "Add Repositories" --checklist \ @@ -35,29 +35,6 @@ add_repositories() { for repo in $selected_repos; do case $repo in - "\"BlackArch\"") - if ! grep -q "\[blackarch\]" /etc/pacman.conf; then - curl -O https://blackarch.org/strap.sh - chmod +x strap.sh - sudo sed -i 's/msg '\''installing blackarch-officials meta-package...'\''/#msg '\''installing blackarch-officials meta-package...'\''/' strap.sh - sudo sed -i 's/pacman -S --noconfirm --needed blackarch-officials/#pacman -S --noconfirm --needed blackarch-officials/' strap.sh - sudo ./strap.sh - else - echo "BlackArch repository is already installed." - fi - ;; - "\"Chaotic.cx\"") - if ! grep -q "\[chaotic-aur\]" /etc/pacman.conf; then - sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com - sudo pacman-key --lsign-key 3056513887B78AEB - sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' - sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' - echo '[chaotic-aur]' | sudo tee -a /etc/pacman.conf - echo 'Include = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf - else - echo "Chaotic.cx repository is already installed." - fi - ;; "\"CachyOS\"") if ! grep -q "\[cachyos\]" /etc/pacman.conf; then curl https://mirror.cachyos.org/cachyos-repo.tar.xz -o /tmp/cachyos-repo.tar.xz @@ -81,6 +58,29 @@ add_repositories() { echo "Chromatic repository is already installed." fi ;; + "\"BlackArch\"") + if ! grep -q "\[blackarch\]" /etc/pacman.conf; then + curl -O https://blackarch.org/strap.sh + chmod +x strap.sh + sudo sed -i 's/msg '\''installing blackarch-officials meta-package...'\''/#msg '\''installing blackarch-officials meta-package...'\''/' strap.sh + sudo sed -i 's/pacman -S --noconfirm --needed blackarch-officials/#pacman -S --noconfirm --needed blackarch-officials/' strap.sh + sudo ./strap.sh + else + echo "BlackArch repository is already installed." + fi + ;; + "\"Chaotic.cx\"") + if ! grep -q "\[chaotic-aur\]" /etc/pacman.conf; then + sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com + sudo pacman-key --lsign-key 3056513887B78AEB + sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' + sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' + echo '[chaotic-aur]' | sudo tee -a /etc/pacman.conf + echo 'Include = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf + else + echo "Chaotic.cx repository is already installed." + fi + ;; esac done }