diff --git a/install.sh b/install.sh index cd18e2d..519b402 100755 --- a/install.sh +++ b/install.sh @@ -16,7 +16,7 @@ echo ' |____/ \__ | \__ _|_| \_/ |_|_| |_|_|\___/|_|_|\___/ |___/ - --------------- Single Download script --------------- + --------------- Single Download script (Beta) --------------- BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE UNDER THE GPL-2.0 LICENCE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. See the LICENCE for more detail @@ -82,6 +82,7 @@ OPTIONS=( 3 "Install Docker" OFF 4 "Install Pacman Packages" ON 5 "Install Yay and AUR Packages" ON + 6 "Install affinity with GUI" OFF ) CHOICE=$(whiptail --title "Installation Options" --checklist \ @@ -110,7 +111,7 @@ for selection in $CHOICE; do echo "Found local script, running..." bash zsh.sh --skip-watermark else - bash -c "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh)" --skip-watermark + bash "$(curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh)" --skip-watermark fi ;; "2") @@ -138,74 +139,93 @@ for selection in $CHOICE; do "4") echo "Installing Pacman Packages..." # Check if pacman binary is installed - if ! command -v pacman >/dev/null; then + if command -v pacman /dev/null; then + if command -v pacman /dev/null; then + echo "yay is NOT installed. Running installation commands..." + if ! git clone https://aur.archlinux.org/yay.git /tmp/yay_install; then echo "--------------------------------------------------------------------" - echo "Failed to install prerequisite packages for Yay. You can try running it manually:" - echo "sudo pacman -S --needed --noconfirm efibootmgr sbsigntools mokutil sbctl go fakeroot debugedit make gcc" + echo "Failed to clone yay repository. You can try running it manually:" + echo "git clone https://aur.archlinux.org/yay.git /tmp/yay_install" + echo "--------------------------------------------------------------------" + exit 1 # exit with an error + elif ! (cd /tmp/yay_install && makepkg -si --noconfirm); then + echo "--------------------------------------------------------------------" + echo "Failed to build and install yay. You can try running it manually:" + echo "cd /tmp/yay_install && makepkg -si --noconfirm" echo "--------------------------------------------------------------------" exit 1 # exit with an error fi - # Check if yay binary exists - if ! command -v yay >/dev/null; then - echo "yay is NOT installed. Running installation commands..." - if ! git clone https://aur.archlinux.org/yay.git /tmp/yay_install; then - echo "--------------------------------------------------------------------" - echo "Failed to clone yay repository. You can try running it manually:" - echo "git clone https://aur.archlinux.org/yay.git /tmp/yay_install" - echo "--------------------------------------------------------------------" - exit 1 # exit with an error - elif ! (cd /tmp/yay_install && makepkg -si --noconfirm); then - echo "--------------------------------------------------------------------" - echo "Failed to build and install yay. You can try running it manually:" - echo "cd /tmp/yay_install && makepkg -si --noconfirm" - echo "--------------------------------------------------------------------" - exit 1 # exit with an error - fi - cd $PreviousWD - rm -rf /tmp/yay_install - else - echo "Yay is already installed." - fi - # Install yay packages - # Runs local script unless it does no exist or fails - if [[ -f "./config/PackagesYay.txt" ]]; then - echo "Found local config" - cat ./config/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm - elif ! curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm; then - echo "--------------------------------------------------------------------" - echo "Failed to install Yay packages. You can try running it manually:" - echo "curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm" - echo "--------------------------------------------------------------------" - echo "+ sleep 10" && sleep 10 - fi + cd $PreviousWD + rm -rf /tmp/yay_install + else + echo "Yay is already installed." + fi + # Install yay packages + # Runs local script unless it does no exist or fails + if [[ -f "./config/PackagesYay.txt" ]]; then + echo "Found local config" + cat ./config/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm + elif ! curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm; then + echo "--------------------------------------------------------------------" + echo "Failed to install Yay packages. You can try running it manually:" + echo "curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesYay.txt | yay -S --needed --save --answerclean None --answerdiff None - --noconfirm" + echo "--------------------------------------------------------------------" + echo "+ sleep 10" && sleep 10 fi ;; + "6") + echo "Installing GUI dependencies" + if command -v pacman