harden AE6E66 module installer

Author: mearvk

modules/AE6E66/install/install.sh

@@ -1,55 +1,59 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # AE6E66™ — Module Install Script
-# Ensures UFW firewall is installed/enabled and module ports are open.
-# Usage: sudo bash install/install.sh
-set -e
+# Location-independent, idempotent module installation.
+set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 MOD_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-NWE_ROOT="$(cd "$MOD_ROOT/../.." 2>/dev/null && pwd)"
-[ -f "$NWE_ROOT/scripts/nwe-ports.sh" ] && source "$NWE_ROOT/scripts/nwe-ports.sh"
+NWE_ROOT="$(cd "$MOD_ROOT/../.." && pwd)"
+PORTS_LIB="$NWE_ROOT/scripts/nwe-ports.sh"
+DB_SETUP="$MOD_ROOT/servlets/setup-db.sh"
+
+[[ -d "$NWE_ROOT" && -d "$NWE_ROOT/scripts" ]] || {
+    echo "[FAIL] Unable to resolve NWE repository root: $NWE_ROOT" >&2
+    exit 1
+}
+
+if [[ -f "$PORTS_LIB" ]]; then
+    # shellcheck source=/dev/null
+    source "$PORTS_LIB"
+fi
 
 echo "═══════════════════════════════════════════════════════════════"
 echo " AE6E66™ — Module Install"
+echo " Repository: $NWE_ROOT"
 echo "═══════════════════════════════════════════════════════════════"
-echo ""
 
-# 1. Database setup
 echo "[1/2] Database setup..."
-if [ -f "$MOD_ROOT/servlets/setup-db.sh" ]; then
-    bash "$MOD_ROOT/servlets/setup-db.sh" && echo "  [✓] Database nwe_ae6e66 ready" || echo "  [!] Database setup had issues"
+if [[ -f "$DB_SETUP" ]]; then
+    bash "$DB_SETUP"
+    echo "  [✓] Database setup completed"
 else
-    echo "  [--] No setup-db.sh found (database may already exist)"
+    echo "  [--] No setup-db.sh found; database setup skipped"
 fi
 
-# 2. Firewall (UFW install + enable + open ports)
-echo ""
+echo
 echo "[2/2] Configuring firewall..."
-if type nwe_ensure_ufw &>/dev/null; then
+if declare -F nwe_ensure_ufw >/dev/null 2>&1; then
     nwe_ensure_ufw
-    sudo ufw allow 8080/tcp >/dev/null 2>&1 && echo "  [✓] Port 8080 (Tomcat) opened" || true
-
-else
-    echo "  [--] NWE port library not available — installing UFW manually..."
-    if command -v apt-get &>/dev/null; then
-        sudo apt-get install -y -qq ufw >/dev/null 2>&1
-    elif command -v dnf &>/dev/null; then
-        sudo dnf install -y -q ufw >/dev/null 2>&1
-    fi
-    if command -v ufw &>/dev/null; then
-        sudo ufw allow 22/tcp >/dev/null 2>&1
-        sudo ufw allow 8080/tcp >/dev/null 2>&1
+fi
 
-        sudo ufw --force enable >/dev/null 2>&1
-        echo "  [✓] UFW installed and ports opened"
+if command -v ufw >/dev/null 2>&1; then
+    if [[ "$(id -u)" -eq 0 ]]; then
+        ufw allow 8080/tcp >/dev/null
+    elif command -v sudo >/dev/null 2>&1; then
+        sudo ufw allow 8080/tcp >/dev/null
     else
-        echo "  [!] Could not install UFW — open ports manually"
+        echo "[FAIL] UFW is installed but root/sudo access is unavailable." >&2
+        exit 1
     fi
+    echo "  [✓] Port 8080 (Tomcat) configured"
+else
+    echo "  [--] UFW unavailable; firewall configuration skipped"
 fi
 
-echo ""
+echo
 echo "═══════════════════════════════════════════════════════════════"
 echo " AE6E66™ install complete."
-
-echo " Frontend:     http://localhost:8080/ae6e66/"
+echo " Frontend: http://localhost:8080/ae6e66/"
 echo "═══════════════════════════════════════════════════════════════"