diff --git a/install/debian-install.sh b/install/debian-install.sh index 78baf6e..f970cf5 100644 --- a/install/debian-install.sh +++ b/install/debian-install.sh @@ -104,11 +104,11 @@ $STD apt-get -y autoremove $STD apt-get -y autoclean msg_ok "Cleaned" -read -p "Remove this script? " prompt -if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then - pct stop "$CTID" - pct remove "$CTID" - msg_ok "Removed this script" -else - msg_warn "Did not remove this script" -fi +# read -p "Remove this script? " prompt +# if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then +# pct stop "$CTID" +# pct remove "$CTID" +# msg_ok "Removed this script" +# else +# msg_warn "Did not remove this script" +# fi diff --git a/misc/install.func b/misc/install.func index 6131ccd..0f23430 100644 --- a/misc/install.func +++ b/misc/install.func @@ -132,10 +132,10 @@ network_check() { for HOST in "${GITHUB_HOSTS[@]}"; do RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1) if [[ -z "$RESOLVEDIP" ]]; then - GITHUB_STATUS+="$HOST: ($DNSFAIL)" + GITHUB_STATUS+="$HOST:($DNSFAIL)" DNS_FAILED=true else - GITHUB_STATUS+=" $HOST: ($DNSOK)" + GITHUB_STATUS+=" $HOST:($DNSOK)" fi done diff --git a/misc/tools.func b/misc/tools.func index 5250ef0..65c2cbe 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -353,6 +353,7 @@ install_php() { CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2) else CURRENT_PHP="" + msg_info "Setup PHP: $PHP_VERSION" fi if [[ "$CURRENT_PHP" != "$PHP_VERSION" ]]; then @@ -442,7 +443,7 @@ install_composer() { # Download and install latest composer curl -fsSL https://getcomposer.org/installer -o /tmp/composer-setup.php - script -q -c "php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer" /dev/null + script -q -c "php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer" >/dev/null if [[ $? -ne 0 ]]; then msg_error "Failed to install Composer"