mirror of
https://github.com/myvesta/vesta
synced 2025-08-21 13:54:28 -07:00
Separating v-install-wp-cli-myvesta. Update v-run-wp-cli to display error log if PHP Fatal Error occured. Updating v-run-wp-cli to use standard wp-cli, making v-run-wp-cli-myvesta for myvesta version of wp-cli.
This commit is contained in:
Peca
parent
35653eec54
commit
95ed753b0b
4 changed files with 81 additions and 42 deletions
|
|
@ -12,46 +12,11 @@ if [ "$whoami" != "root" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Importing system environment
|
||||
source /etc/profile
|
||||
|
||||
if [ ! -f "/usr/local/bin/composer" ]; then
|
||||
echo "= Composer is not installed. Installing..."
|
||||
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
|
||||
php composer-setup.php --install-dir=/usr/local/bin --filename=composer
|
||||
php -r "unlink('composer-setup.php');"
|
||||
echo "= Composer installed successfully."
|
||||
fi
|
||||
|
||||
if [ -d "/usr/local/bin/wp-cli" ]; then
|
||||
echo "= Removing old myVesta WP CLI..."
|
||||
rm -rf /usr/local/bin/wp-cli
|
||||
fi
|
||||
|
||||
echo "= Installing classic WP CLI..."
|
||||
echo "= Installing WP CLI by downloading phar file..."
|
||||
wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O /usr/local/bin/wp
|
||||
chmod +x /usr/local/bin/wp
|
||||
|
||||
echo "= Installing myVesta WP CLI..."
|
||||
|
||||
cd /usr/local/bin
|
||||
git clone https://github.com/wp-cli/wp-cli.git
|
||||
|
||||
chown -R www-data:www-data wp-cli
|
||||
|
||||
cd wp-cli/
|
||||
sudo -H -u www-data composer install
|
||||
|
||||
echo "= Installing search-replace-command package..."
|
||||
sudo -H -u www-data WP_CLI_PACKAGES_DIR=/usr/local/bin/wp-cli/packages php /usr/local/bin/wp-cli/php/boot-fs.php package install wp-cli/search-replace-command
|
||||
|
||||
# Fix terminal columns issue for WP CLI
|
||||
echo "= Fixing terminal columns issue for WP CLI..."
|
||||
/usr/local/vesta/bin/v-sed '$columns = 80;' "if (file_exists('/usr/local/bin/wp-cli/COLUMNS')) \$columns=intval(file_get_contents('/usr/local/bin/wp-cli/COLUMNS')); else \$columns = 80;" '/usr/local/bin/wp-cli/vendor/wp-cli/php-cli-tools/lib/cli/Shell.php'
|
||||
|
||||
echo ""
|
||||
|
||||
if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ] || [ -f "/usr/local/bin/wp" ]; then
|
||||
if [ -f "/usr/local/bin/wp" ]; then
|
||||
echo "= WP CLI installed successfully."
|
||||
echo "= Usage: v-run-wp-cli DOMAIN WP_CLI_COMMAND"
|
||||
exit 0;
|
||||
|
|
|
|||
58
bin/v-install-wp-cli-myvesta
Normal file
58
bin/v-install-wp-cli-myvesta
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
#!/bin/bash
|
||||
# info: Download myVesta WP CLI
|
||||
# options: NONE
|
||||
|
||||
#----------------------------------------------------------#
|
||||
# Variable&Function #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
whoami=$(whoami)
|
||||
if [ "$whoami" != "root" ]; then
|
||||
echo "You must be root to execute this script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Importing system environment
|
||||
source /etc/profile
|
||||
|
||||
if [ ! -f "/usr/local/bin/composer" ]; then
|
||||
echo "= Composer is not installed. Installing..."
|
||||
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
|
||||
php composer-setup.php --install-dir=/usr/local/bin --filename=composer
|
||||
php -r "unlink('composer-setup.php');"
|
||||
echo "= Composer installed successfully."
|
||||
fi
|
||||
|
||||
if [ -d "/usr/local/bin/wp-cli" ]; then
|
||||
echo "= Removing old myVesta WP CLI..."
|
||||
rm -rf /usr/local/bin/wp-cli
|
||||
fi
|
||||
|
||||
echo "= Installing myVesta WP CLI..."
|
||||
|
||||
cd /usr/local/bin
|
||||
git clone https://github.com/wp-cli/wp-cli.git
|
||||
|
||||
chown -R www-data:www-data wp-cli
|
||||
|
||||
cd wp-cli/
|
||||
sudo -H -u www-data composer install
|
||||
|
||||
echo "= Installing search-replace-command package..."
|
||||
sudo -H -u www-data WP_CLI_PACKAGES_DIR=/usr/local/bin/wp-cli/packages php /usr/local/bin/wp-cli/php/boot-fs.php package install wp-cli/search-replace-command
|
||||
|
||||
# Fix terminal columns issue for WP CLI
|
||||
echo "= Fixing terminal columns issue for WP CLI..."
|
||||
/usr/local/vesta/bin/v-sed '$columns = 80;' "if (file_exists('/usr/local/bin/wp-cli/COLUMNS')) \$columns=intval(file_get_contents('/usr/local/bin/wp-cli/COLUMNS')); else \$columns = 80;" '/usr/local/bin/wp-cli/vendor/wp-cli/php-cli-tools/lib/cli/Shell.php'
|
||||
|
||||
echo ""
|
||||
|
||||
if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then
|
||||
echo "= myVesta WP CLI installed successfully."
|
||||
echo "= Usage: v-run-wp-cli-myvesta DOMAIN WP_CLI_COMMAND"
|
||||
exit 0;
|
||||
else
|
||||
echo "= myVesta WP CLI installation failed."
|
||||
echo "= Please install it manually."
|
||||
exit 1;
|
||||
fi
|
||||
|
|
@ -61,12 +61,19 @@ if [ ! -f "/usr/local/bin/wp" ] || [ ! -f "/usr/local/bin/wp-cli/php/boot-fs.php
|
|||
/usr/local/vesta/bin/v-install-wp-cli
|
||||
fi
|
||||
|
||||
output='terminal'
|
||||
if [ -t 1 ]; then
|
||||
output='terminal'
|
||||
else
|
||||
output='file'
|
||||
fi
|
||||
|
||||
if [ -f "/usr/local/bin/wp" ]; then
|
||||
wpcli="/usr/local/bin/wp"
|
||||
WP_CLI_PACKAGES_DIR=""
|
||||
fi
|
||||
|
||||
if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ] && [ -d "/usr/local/bin/wp-cli/packages/vendor/wp-cli/search-replace-command" ] && [ -z "$USE_WP_CLI_BUNDLED" ]; then
|
||||
if [ ! -z "$USE_WP_CLI_MYVESTA" ] && [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ] && [ -d "/usr/local/bin/wp-cli/packages/vendor/wp-cli/search-replace-command" ] && [ "$output" == "terminal" ]; then
|
||||
wpcli="/usr/local/bin/wp-cli/php/boot-fs.php"
|
||||
COLUMNS=$(/usr/bin/env stty size 2>/dev/null | awk '{print $2}')
|
||||
echo $COLUMNS > /usr/local/bin/wp-cli/COLUMNS
|
||||
|
|
@ -113,10 +120,11 @@ if [ -f "/usr/local/bin/wp-cli/COLUMNS" ]; then
|
|||
rm /usr/local/bin/wp-cli/COLUMNS
|
||||
fi
|
||||
|
||||
# echo "WP CLI: Done."
|
||||
# echo "To see Warning/Error log: "
|
||||
# echo "cat /home/$user/web/$domain/wp-cli-error.log"
|
||||
|
||||
if [ -z "$SHOW_ERRORS" ]; then
|
||||
if grep -q "PHP Fatal error" /home/$user/web/$domain/wp-cli-error.log || [ $return_code -ne 0 ]; then
|
||||
cat /home/$user/web/$domain/wp-cli-error.log
|
||||
fi
|
||||
fi
|
||||
#----------------------------------------------------------#
|
||||
# Vesta #
|
||||
#----------------------------------------------------------#
|
||||
|
|
|
|||
8
bin/v-run-wp-cli-myvesta
Normal file
8
bin/v-run-wp-cli-myvesta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ ! -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then
|
||||
echo "= myVesta WP CLI is not installed. Installing..."
|
||||
/usr/local/vesta/bin/v-install-wp-cli-myvesta
|
||||
fi
|
||||
|
||||
USE_WP_CLI_MYVESTA=1 /usr/local/vesta/bin/v-run-wp-cli "$@"
|
||||
Loading…
Add table
Add a link
Reference in a new issue