From 8f1e973d964c5106871eb1c20d7a04619c21a6bf Mon Sep 17 00:00:00 2001
From: Anthony <anthonykewl20@gmail.com>
Date: Fri, 3 Nov 2023 23:23:56 +0800
Subject: [PATCH] Add debugging and logging for WP-CLI installation

---
 add-sftp.sh  | 38 +++++++++++++++++++++++---------------
 manifest.jps | 11 ++++++++++-
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/add-sftp.sh b/add-sftp.sh
index ed08ea8..ac74dbb 100644
--- a/add-sftp.sh
+++ b/add-sftp.sh
@@ -60,22 +60,30 @@ if ! useradd -d $USER_HOME $USERNAME; then
     exit 1
 fi
 
-# Enable SSH access if requested
-if [ "$SSH_ENABLED" == "true" ]; then
-    usermod -s /bin/bash $USERNAME
-    usermod -aG wp-admins $USERNAME  # Add user to wp-admins group
-    
-    # Ensure WP-CLI is installed
-    if ! command -v wp &> /dev/null; then
-        if curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar &&
-           chmod +x wp-cli.phar &&
-           mv wp-cli.phar /usr/local/bin/wp; then
-            log "WP-CLI installed successfully."
-        else
-            log_error "Failed to install WP-CLI."
-            exit 1
-        fi
+# Ensure WP-CLI is installed
+if ! command -v wp &> /dev/null; then
+    if curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar; then
+        log "WP-CLI phar file downloaded successfully."
+    else
+        log_error "Failed to download WP-CLI phar file."
+        exit 1
     fi
+    
+    if chmod +x wp-cli.phar; then
+        log "Permissions set on WP-CLI phar file."
+    else
+        log_error "Failed to set execute permissions on WP-CLI phar file."
+        exit 1
+    fi
+    
+    if mv wp-cli.phar /usr/local/bin/wp; then
+        log "WP-CLI installed successfully."
+    else
+        log_error "Failed to move WP-CLI phar file to /usr/local/bin/wp."
+        exit 1
+    fi
+else
+    log "WP-CLI is already installed."
 fi
 
 [ ! -d "$ROOT_DIRECTORY" ] && { log_error "ROOT_DIRECTORY $ROOT_DIRECTORY does not exist."; exit 2; }
diff --git a/manifest.jps b/manifest.jps
index 340caf5..765bd73 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -43,7 +43,6 @@ onInstall:
         mkdir -p /home/jelastic/add-sftp-user-addon/ 
         mkdir -p /home/jelastic/add-sftp-user-addon/logs 
         touch /home/jelastic/add-sftp-user-addon/logs/script_output.log 
-        touch /home/jelastic/add-sftp-user-addon/logs/sftp-users.log 
         wget https://deploy-proxy.mightybox.io/addons/add-sftp-user/raw/branch/main/add-sftp.sh -O /home/jelastic/add-sftp-user-addon/add-sftp.sh
         chmod +x /home/jelastic/add-sftp-user-addon/*.sh
   - cmd[cp]: 
@@ -73,6 +72,16 @@ actions:
     - cmd[cp]: 
         user: root
         commands: bash /home/jelastic/add-sftp-user-addon/add-sftp.sh ${globals.username} ${globals.password}
+    - cmd[cp]: 
+        user: root
+        commands: echo $CREATED_USERNAME
+    - setGlobals:
+        username: ${response.out}
+    - cmd[cp]: 
+        user: root
+        commands: echo $CREATED_PASSWORD
+    - setGlobals:
+        password: ${response.out}
     - return: sftpSuccess
   change_password:
     - cmd[cp]: