From b63ddfc56898915c1dd93290b18fde2d58d35b8f Mon Sep 17 00:00:00 2001
From: Richard Anderson <richard@andermail.co.uk>
Date: Wed, 22 Jan 2025 19:24:44 +0000
Subject: [PATCH] WordPress Deployment Fix (#441)

* Resolved Issue with WordPress

* Fix for Vito User
---
 app/SSH/OS/scripts/create-isolated-user.sh | 1 +
 app/SSH/Wordpress/Wordpress.php            | 2 +-
 app/SSH/Wordpress/scripts/install.sh       | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/SSH/OS/scripts/create-isolated-user.sh b/app/SSH/OS/scripts/create-isolated-user.sh
index 8c3280d..4396d25 100644
--- a/app/SSH/OS/scripts/create-isolated-user.sh
+++ b/app/SSH/OS/scripts/create-isolated-user.sh
@@ -9,6 +9,7 @@ sudo mkdir /home/__user__/tmp
 sudo mkdir /home/__user__/bin
 sudo mkdir /home/__user__/.ssh
 echo 'export PATH="/home/__user__/bin:$PATH"' | sudo tee -a /home/__user__/.bashrc
+echo 'export PATH="/home/__user__/bin:$PATH"' | sudo tee -a /home/__user__/.profile
 sudo usermod -a -G __user__ __server_user__
 sudo chown -R __user__:__user__ /home/__user__
 sudo chmod -R 755 /home/__user__
diff --git a/app/SSH/Wordpress/Wordpress.php b/app/SSH/Wordpress/Wordpress.php
index 12835ca..134ff68 100644
--- a/app/SSH/Wordpress/Wordpress.php
+++ b/app/SSH/Wordpress/Wordpress.php
@@ -15,7 +15,7 @@ public function install(Site $site): void
             $this->getScript('install.sh', [
                 'path' => $site->path,
                 'domain' => $site->domain,
-                'is_isolated' => $site->isIsolated(),
+                'is_isolated' => $site->isIsolated() ? 'true' : 'false',
                 'isolated_username' => $site->user,
                 'db_name' => $site->type_data['database'],
                 'db_user' => $site->type_data['database_user'],
diff --git a/app/SSH/Wordpress/scripts/install.sh b/app/SSH/Wordpress/scripts/install.sh
index 3d8ca5c..6180870 100644
--- a/app/SSH/Wordpress/scripts/install.sh
+++ b/app/SSH/Wordpress/scripts/install.sh
@@ -7,11 +7,10 @@ if ! chmod +x wp-cli.phar; then
 fi
 
 if [ "__is_isolated__" == "true" ]; then
-    if ! mv wp-cli.phar /home/__isolated_username__/bin/wp; then
-        echo 'VITO_SSH_ERROR' && exit 1
-    fi
+    mv wp-cli.phar /home/__isolated_username__/bin/
+    ln -s /home/__isolated_username__/bin/wp-cli.phar /home/__isolated_username__/bin/wp
 else
-    if ! mv wp-cli.phar /usr/local/bin/wp; then
+    if ! sudo mv wp-cli.phar /usr/local/bin/wp; then
         echo 'VITO_SSH_ERROR' && exit 1
     fi
 fi