Fixes

PDowney · web-flow · commit 5c09dbac3a7f · 2026-04-10T04:43:55.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to EngineScript will be documented in this file.
 
 Changes are organized by date, with the most recent changes listed first.
 
+## 2026-04-10
+
+### 🐛 VHOST IMPORT EXTRACTION FLOW FIX
+
+- Removed a duplicate WordPress extraction block in `scripts/functions/vhost/vhost-import.sh` that re-ran archive extraction and wp-config path detection after those steps had already completed.
+- Prevented a single-zip import failure path where the duplicate block referenced `${WP_ARCHIVE_FILE}` (only populated in the two-file flow), which could trigger an unrecognized archive error.
+- Kept the unified conditional extraction logic as the single source of truth for both `single_zip` and `two_file` import formats.
+
 ## 2026-04-08
 
 ### 🧹 NGINX MIME AND COMPRESSION CLEANUP
diff --git a/config/var/www/admin/control-panel/external-services/external-services.js b/config/var/www/admin/control-panel/external-services/external-services.js
@@ -65,7 +65,7 @@ export class ExternalServicesManager {
    * @returns {Promise<void>}
    */
   async loadExternalServices() {
-    try { // codacy:ignore - Try/catch required for service loading
+    try { // codacy:ignore - Top-level UI orchestration boundary: DOM/rendering and service-processing steps may throw; catch here to log once and show renderErrorState instead of leaving a partially rendered dashboard.
       this.container.replaceChildren();
 
       // Get service definitions and preferences
@@ -1025,7 +1025,7 @@ export class ExternalServicesManager {
   applyStatusDataToCard(serviceKey, serviceDef, data, isFeed) {
     const serviceCard = this.getServiceCardElement(serviceKey, serviceDef);
     if (!serviceCard) return;
-    const { statusClass, statusIcon, statusColor } = this.getStatusDisplayValues(data.status.indicator, isFeed); // codacy:ignore - Destructuring assignment
+    const { statusClass, statusIcon, statusColor } = this.getStatusDisplayValues(data.status.indicator, isFeed);
     this.updateServiceCardStatus(serviceCard, data.status.description, statusClass, statusIcon, statusColor);
   }
 
@@ -1545,11 +1545,11 @@ export class ExternalServicesManager {
   }
 
   /**
-   * Announce message to screen readers via live region
+   * Announce message to screen readers via live region.
+   * Uses a dedicated live region for accessibility announcements in this module.
    * @param {string} message - Message to announce
    * @returns {void}
    */
-  // Uses a dedicated live region for accessibility announcements in this module.
   announceToScreenReader(message) {
     if (!this.liveRegion) {
       this.liveRegion = document.createElement('div');
diff --git a/scripts/ci/run-install-step.sh b/scripts/ci/run-install-step.sh
@@ -51,7 +51,7 @@ if [ "$SCRIPT_EXIT_CODE" -ne 0 ]; then
   fi
   echo "Script end time: $(date)" >> "$LOG_PATH"
   echo "Last 50 lines of output:"
-  tail -50 "$LOG_PATH" 2>/dev/null || echo "Unable to read log file: $LOG_PATH"
+  tail -50 "$LOG_PATH" || echo "Failed to display log file contents: $LOG_PATH"
 
   exit 1
 fi
diff --git a/scripts/functions/server-tools/analyze-tables.sh b/scripts/functions/server-tools/analyze-tables.sh
@@ -18,9 +18,6 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
 #----------------------------------------------------------------------------------
 # Start Main Script
 
-source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
-source /home/EngineScript/enginescript-install-options.txt || { echo "Error: Failed to source /home/EngineScript/enginescript-install-options.txt" >&2; exit 1; }
-
 RUN_SQL=/tmp/analyze_all_tables.sql
 RUN_LOG=/tmp/analyze_all_tables.log
 
diff --git a/scripts/functions/vhost/vhost-import.sh b/scripts/functions/vhost/vhost-import.sh
@@ -253,51 +253,6 @@ echo "PASSED: Determined table prefix from database: ${PREFIX}"
 # --- End Prefix Extraction ---
 
 
-# --- Extract WordPress Archive ---
-echo "Extracting WordPress archive..."
-# Clean up any previous extraction attempt
-rm -rf "${WP_EXTRACTED_PATH}"
-mkdir -p "${WP_EXTRACTED_PATH}"
-
-if [[ "${WP_ARCHIVE_FILE}" == *.zip ]]; then
-    unzip -q "${WP_ARCHIVE_FILE}" -d "${WP_EXTRACTED_PATH}"
-    EXTRACT_STATUS=$?
-elif [[ "${WP_ARCHIVE_FILE}" == *.tar.gz || "${WP_ARCHIVE_FILE}" == *.tgz ]]; then
-    tar -zxf "${WP_ARCHIVE_FILE}" -C "${WP_EXTRACTED_PATH}"
-    EXTRACT_STATUS=$?
-else
-    echo "FAILED: Unrecognized archive format for ${WP_ARCHIVE_FILE}"
-    exit 1
-fi
-
-if [[ $EXTRACT_STATUS -ne 0 ]]; then
-    echo "FAILED: Could not extract archive file ${WP_ARCHIVE_FILE}"
-    rm -rf "${WP_EXTRACTED_PATH}" # Clean up failed extraction
-    exit 1
-fi
-
-# Check for wp-config.php within the extracted directory
-# Handle cases where tar/zip might create a subdirectory
-# Find wp-config.php within the extracted path, potentially in a subdirectory
-WP_CONFIG_REL_PATH=$(find "${WP_EXTRACTED_PATH}" -name "wp-config.php" -printf "%P\n" | head -n 1)
-if [[ -z "$WP_CONFIG_REL_PATH" ]]; then
-    echo "FAILED: wp-config.php not found within the extracted archive content in ${WP_EXTRACTED_PATH}"
-    rm -rf "${WP_EXTRACTED_PATH}" # Clean up
-    exit 1
-fi
-
-# Determine the actual source path (could be WP_EXTRACTED_PATH or a subdirectory within it)
-if [[ "$WP_CONFIG_REL_PATH" == "wp-config.php" ]]; then
-    # wp-config.php is directly in WP_EXTRACTED_PATH
-    WP_FILES_SOURCE_PATH="${WP_EXTRACTED_PATH}"
-else
-    # wp-config.php is in a subdirectory, adjust the source path
-    SUBDIR=$(dirname "$WP_CONFIG_REL_PATH")
-    WP_FILES_SOURCE_PATH="${WP_EXTRACTED_PATH}/${SUBDIR}"
-fi
-echo "PASSED: Archive extracted. WordPress source path set to: ${WP_FILES_SOURCE_PATH}"
-
-
 # --- Extract Information from wp-config.php ---
 echo "Extracting site information from wp-config.php..."
 WP_CONFIG_PATH="${WP_FILES_SOURCE_PATH}/wp-config.php" # Use the determined source path
diff --git a/scripts/install/openssl/openssl-install.sh b/scripts/install/openssl/openssl-install.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-#!/usr/bin/env bash
 #----------------------------------------------------------------------------------
 # EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
 #----------------------------------------------------------------------------------
diff --git a/scripts/install/tools/security/maldet.sh b/scripts/install/tools/security/maldet.sh
@@ -21,7 +21,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
 # Maldet Install
 cd /usr/local/src
 download_and_extract "https://www.rfxn.com/downloads/maldetect-current.tar.gz" "/usr/local/src/maldetect-current.tar.gz" "/usr/local/src"
-cd maldetect-1.6.4/
+cd /usr/local/src/maldetect-*/ || { echo "Error: Failed to locate extracted maldetect directory in /usr/local/src" >&2; exit 1; }
 ./install.sh
 echo "/sys" >> /usr/local/maldetect/ignore_paths
 
diff --git a/scripts/install/tools/security/wpscan.sh b/scripts/install/tools/security/wpscan.sh
@@ -19,6 +19,6 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
 # Start Main Script
 
 # WPScan
-gem install wpscan
+gem install wpscan || { echo "Error: Failed to install WPScan via gem" >&2; exit 1; }
 
 print_install_banner "WPScan"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`		`-#!/usr/bin/env bash`
`3`	`2`	`#----------------------------------------------------------------------------------`
`4`	`3`	`# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare`
`5`	`4`	`#----------------------------------------------------------------------------------`