From b13b25602c1901cea81a37ed64516bd64f8f41fe Mon Sep 17 00:00:00 2001
From: Peca <peca@mycity.rs>
Date: Tue, 17 Jun 2025 19:29:58 +0200
Subject: [PATCH] Use wp-cli from git repo if available

---
 bin/v-run-wp-cli | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/v-run-wp-cli b/bin/v-run-wp-cli
index 9325d47d..31730f63 100644
--- a/bin/v-run-wp-cli
+++ b/bin/v-run-wp-cli
@@ -58,6 +58,12 @@ if ! command -v wp &> /dev/null; then
     echo "WP CLI installed successfully."
 fi
 
+wpcli="/usr/local/bin/wp"
+
+if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then
+    wpcli="/usr/local/bin/wp-cli/php/boot-fs.php"
+fi
+
 if [ ! -d "/home/$user/web/$domain/public_html" ]; then
     # echo "Domain doesn't exist";
     exit 1;
@@ -73,7 +79,7 @@ phpver=$(/usr/local/vesta/bin/v-get-php-version-of-domain "$domain")
 #----------------------------------------------------------#
 
 cd /home/$USER/web/$domain/public_html
-sudo -u $USER /usr/bin/php$phpver -d disable_functions=pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen -d open_basedir=/home/$user/web/$domain:/home/$user/.wp-cli:/home/$user/tmp:/usr/local/bin /usr/local/bin/wp --path=/home/$user/web/$domain/public_html/ $wp_command 2>/home/$user/web/$domain/wp-cli-error.log
+sudo -u $USER /usr/bin/php$phpver -d disable_functions=pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen -d open_basedir=/home/$user/web/$domain:/home/$user/.wp-cli:/home/$user/tmp:/usr/local/bin $wpcli --path=/home/$user/web/$domain/public_html/ $wp_command 2>/home/$user/web/$domain/wp-cli-error.log
 
 # echo "WP CLI: Done."
 # echo "To see Warning/Error log: "