mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 17:37:36 +02:00
Change: The installer now pings www.google.com to check for internet connection
Change: Use wget --quiet mode
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Amelia installer for Archlinux
|
# Amelia installer for Archlinux
|
||||||
# Version: 1.2.0
|
# Version: 1.2.1
|
||||||
# Source: https://gitlab.com/prism7/archery
|
# Source: https://gitlab.com/prism7/archery
|
||||||
# Contact: leenooks7@gmail.com
|
# Contact: leenooks7@gmail.com
|
||||||
|
|
||||||
@@ -491,15 +491,15 @@ connection_check() {
|
|||||||
|
|
||||||
${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Internet Connection Check${nc} ${magenta}]${nc}--------------------------------${magenta}###
|
${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Internet Connection Check${nc} ${magenta}]${nc}--------------------------------${magenta}###
|
||||||
"
|
"
|
||||||
if ping -c 3 archlinux.org > "${void}" 2>&1; then
|
if ping -c 3 www.google.com > "${void}" 2>&1; then
|
||||||
ok
|
ok
|
||||||
else
|
else
|
||||||
RED "
|
RED "
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
---------------------------------------------------------
|
||||||
### ${nc}A connection to ${yellowl}'www.archlinux.org' ${nc}could not be established ${red}###
|
### ${nc}An internet connection could not be established ${red}###
|
||||||
----------------------------------------------------------------------
|
---------------------------------------------------------
|
||||||
"
|
"
|
||||||
failure
|
failure
|
||||||
fi
|
fi
|
||||||
@@ -6237,9 +6237,8 @@ pkg_validation() {
|
|||||||
ok
|
ok
|
||||||
if [[ -n "${web_aur}" ]]; then
|
if [[ -n "${web_aur}" ]]; then
|
||||||
local prompt="${web_name} Package Validation"
|
local prompt="${web_name} Package Validation"
|
||||||
local stage_prompt="${web_name} Package Validation"
|
|
||||||
pacman -S --noconfirm wget > "${void}"
|
pacman -S --noconfirm wget > "${void}"
|
||||||
if wget -4 --spider "${web_aur_url}" > "${void}" 2>&1 2> "${log}"; then
|
if wget -4q --spider "${web_aur_url}" 2> "${log}"; then
|
||||||
ok
|
ok
|
||||||
else
|
else
|
||||||
err_try
|
err_try
|
||||||
@@ -6248,12 +6247,11 @@ pkg_validation() {
|
|||||||
fi
|
fi
|
||||||
if [[ -n "${nvidia_aur}" ]]; then
|
if [[ -n "${nvidia_aur}" ]]; then
|
||||||
local prompt="Nvidia 580xx Drivers Package Validation"
|
local prompt="Nvidia 580xx Drivers Package Validation"
|
||||||
local stage_prompt="Nvidia 580xx Drivers Package Validation"
|
|
||||||
if [[ ! -e /usr/bin/wget ]]; then
|
if [[ ! -e /usr/bin/wget ]]; then
|
||||||
pacman -S --noconfirm wget > "${void}"
|
pacman -S --noconfirm wget > "${void}"
|
||||||
fi
|
fi
|
||||||
if wget -4 --spider https://aur.archlinux.org/cgit/aur.git/snapshot/nvidia-580xx-utils.tar.gz > "${void}" 2>&1 2> "${log}" &&
|
if wget -4q --spider https://aur.archlinux.org/cgit/aur.git/snapshot/nvidia-580xx-utils.tar.gz 2> "${log}" &&
|
||||||
wget -4 --spider https://aur.archlinux.org/cgit/aur.git/snapshot/nvidia-580xx-settings.tar.gz > "${void}" 2>&1 2> "${log}"; then
|
wget -4q --spider https://aur.archlinux.org/cgit/aur.git/snapshot/nvidia-580xx-settings.tar.gz 2> "${log}"; then
|
||||||
ok
|
ok
|
||||||
else
|
else
|
||||||
err_try
|
err_try
|
||||||
|
|||||||
Reference in New Issue
Block a user