test
This commit is contained in:
parent
f947cb8338
commit
1110ed29fc
@ -104,11 +104,11 @@ $STD apt-get -y autoremove
|
|||||||
$STD apt-get -y autoclean
|
$STD apt-get -y autoclean
|
||||||
msg_ok "Cleaned"
|
msg_ok "Cleaned"
|
||||||
|
|
||||||
read -p "Remove this script? <y/N> " prompt
|
# read -p "Remove this script? <y/N> " prompt
|
||||||
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
|
# if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
|
||||||
pct stop "$CTID"
|
# pct stop "$CTID"
|
||||||
pct remove "$CTID"
|
# pct remove "$CTID"
|
||||||
msg_ok "Removed this script"
|
# msg_ok "Removed this script"
|
||||||
else
|
# else
|
||||||
msg_warn "Did not remove this script"
|
# msg_warn "Did not remove this script"
|
||||||
fi
|
# fi
|
||||||
|
@ -353,6 +353,7 @@ install_php() {
|
|||||||
CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
|
CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
|
||||||
else
|
else
|
||||||
CURRENT_PHP=""
|
CURRENT_PHP=""
|
||||||
|
msg_info "Setup PHP: $PHP_VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
|
if [[ "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
|
||||||
@ -442,7 +443,7 @@ install_composer() {
|
|||||||
|
|
||||||
# Download and install latest composer
|
# Download and install latest composer
|
||||||
curl -fsSL https://getcomposer.org/installer -o /tmp/composer-setup.php
|
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
|
if [[ $? -ne 0 ]]; then
|
||||||
msg_error "Failed to install Composer"
|
msg_error "Failed to install Composer"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user