Update OctoJoom version and improve password validation #10

The OctoJoom version was updated to 3.6.2. Changes were also made to the password validation process to increase the minimum required length of the password from 4 to 11 characters for the correct error message.

src/octojoom

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # The most recent program version.
-_VERSION="3.6.0"
+_VERSION="3.6.2"
 _V="3.6"
 
 # Bash version required
@@ -18,6 +18,12 @@ BACK_TITLE="    Octoleo | ${USER}@${SERVER_HOSTNAME}"
 
 #####################################################################################################################VDM
 ######################################## The environment preparation
+# make sure curl is installed
+command -v curl >/dev/null 2>&1 || {
+  echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require curl."
+  echo >&2 "NOTICE: Please install curl first and then re-run this script again."
+  exit 1
+}
 # Set OS number
 OS_NUMBER=0 # Unknown
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
@@ -27,8 +33,8 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
 elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
   OS_NUMBER=3
 fi
-# Function to check Bash version
+# Check Bash version
-check_bash_version() {
+function check_bash_version() {
   local bash_version="$1"
   local version_string="$BASH_VERSION"
   local major_version="${version_string%%.*}"
@@ -42,19 +48,60 @@ check_bash_version() {
 }
 # Check for the appropriate version of Bash
 check_bash_version "$_bash_v"
-# make sure whiptail is installed
+# Install whiptail on Ubuntu
-command -v whiptail >/dev/null 2>&1 || {
+function install_whiptail_linux() {
-  echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require whiptail."
+  sudo apt-get update
-  exit 1
+  sudo apt-get install whiptail -y
 }
-# make sure curl is installed
+# Install whiptail on macOS
-command -v curl >/dev/null 2>&1 || {
+function install_whiptail_macos() {
-  echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require curl."
+  if ! command -v brew >/dev/null 2>&1; then
-  exit 1
+    echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require Homebrew to install whiptail on macOS."
+    echo >&2 "NOTICE: Please install Homebrew first and then re-run this script."
+    exit 1
+  fi
+  brew install newt
 }
+# Install whiptail on Windows using Chocolatey
+function install_whiptail_windows() {
+  if ! command -v choco >/dev/null 2>&1; then
+    echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require Chocolatey to install whiptail on Windows."
+    echo >&2 "NOTICE: Please install Chocolatey first and then re-run this script."
+    exit 1
+  fi
+  choco install newt
+}
+# Main script
+if ! command -v whiptail >/dev/null 2>&1; then
+  echo "Whiptail is not installed. Do you want to install it now? (y/n)"
+  read -r response
+  if [[ "$response" =~ ^[Yy]$ ]]; then
+    # If the user chooses Yes, install Docker based on the OS
+    case "$OS_NUMBER" in
+      1)
+        install_whiptail_linux
+        ;;
+      2)
+        install_whiptail_macos
+        ;;
+      3)
+        install_whiptail_windows
+        ;;
+      *)
+        echo >&2 "ERROR: Unsupported operating system."
+        exit 1
+        ;;
+    esac
+  else
+    echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require whiptail."
+    echo >&2 "NOTICE: Please install whiptail first and then re-run this script again."
+    exit 1
+  fi
+fi
 # make sure awk is installed
 command -v awk >/dev/null 2>&1 || {
   echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require awk."
+  echo >&2 "NOTICE: Please install awk first and then re-run this script again."
   exit 1
 }
 # make sure rsync is installed (hmmm not always)
@@ -62,8 +109,8 @@ command -v awk >/dev/null 2>&1 || {
 #  echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require rsync."
 #  exit 1
 #}
-# Function to check and install Docker on Linux
+# Check and install Docker on Linux
-install_docker_linux() {
+function install_docker_linux() {
   echo "Installing Docker on Linux..."
  # Add Docker GPG key and repository to sources.list.
   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
@@ -79,15 +126,15 @@ install_docker_linux() {
   sudo systemctl start docker.service
   echo "Docker is installed."
 }
-# Function to check and install Docker on macOS
+# Check and install Docker on macOS
-install_docker_macos() {
+function install_docker_macos() {
   echo "Installing Docker on macOS..."
   brew install --cask docker
   open /Applications/Docker.app
   echo "Docker is installed. Please follow the prompts to complete the installation."
 }
-# Function to check and install Docker on Windows (MSYS/Cygwin)
+# Check and install Docker on Windows (MSYS/Cygwin)
-install_docker_windows() {
+function install_docker_windows() {
   echo "Please download and install Docker Desktop from https://www.docker.com/products/docker-desktop"
   echo "Docker Desktop is required for Windows environments."
   exit 0
@@ -116,11 +163,12 @@ if ! command -v docker &>/dev/null; then
   else
     # If the user chooses No, exit the script with an error message
     echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script requires Docker."
+    echo >&2 "NOTICE: Please install Docker first and then re-run this script again."
     exit 1
   fi
 fi
-# Function to install Docker Compose on Linux
+# Install Docker Compose on Linux
-install_docker_compose_linux() {
+function install_docker_compose_linux() {
   echo "Installing Docker Compose on Linux..."
   # Download the latest Docker Compose binary.
   COMPOSE_VERSION=$(curl --silent https://api.github.com/repos/docker/compose/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
@@ -130,8 +178,8 @@ install_docker_compose_linux() {
   sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
   echo "Docker Compose is installed."
 }
-# Function to install Docker Compose on macOS
+# Install Docker Compose on macOS
-install_docker_compose_macos() {
+function install_docker_compose_macos() {
   echo "Installing Docker Compose on macOS..."
   # Download the latest Docker Compose binary.
   COMPOSE_VERSION=$(curl --silent https://api.github.com/repos/docker/compose/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
@@ -141,8 +189,8 @@ install_docker_compose_macos() {
   sudo ln -s /usr/local/bin/docker-compose /usr/local/bin/docker-compose
   echo "Docker Compose is installed."
 }
-# Function to install Docker Compose on Windows (MSYS/Cygwin)
+# Install Docker Compose on Windows (MSYS/Cygwin)
-install_docker_compose_windows() {
+function install_docker_compose_windows() {
   echo "Please download Docker Compose from https://github.com/docker/compose/releases"
   echo "and place it in a directory included in your PATH."
   exit 0
@@ -171,9 +219,13 @@ if ! command -v docker-compose &>/dev/null; then
   else
     # If the user chooses No, exit the script with an error message
     echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script requires docker-compose."
+    echo >&2 "NOTICE: Please install docker-compose first and then re-run this script again."
     exit 1
   fi
 fi
+# Setting the LC_ALL with respect to language, regional settings, to use POSIX locale,
+# so ASCII character set and standardizes behavior is used for consistent across different environments
+export LC_ALL=C
 # just clear the screen
 clear
 
@@ -262,15 +314,13 @@ function traefik__TRuST__setup() {
 function traefikContainer() {
   # we build the yml file
   cat <<EOF
-version: "3.3"
-
 services:
   traefik:
     container_name: traefik
     image: "traefik:latest"
     command:
-${VDM_REMOVE_SECURE}      - --entrypoints.web.address=:80
+      - --entrypoints.web.address=:80
-${VDM_REMOVE_SECURE}      - --entrypoints.websecure.address=:443
+      - --entrypoints.websecure.address=:443
 #      - --api.dashboard=true
 #      - --api.insecure=true
       - --providers.docker
@@ -303,6 +353,7 @@ ${VDM_REMOVE_SECURE}      - "traefik.http.middlewares.redirect-to-me.redirectsch
 
 networks:
   traefik:
+    external: true
     name: ${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}
 EOF
 }
@@ -376,8 +427,6 @@ function portainer__TRuST__setup() {
 function portainerContainer() {
   # we build the yml file
   cat <<EOF
-version: "3.3"
-
 services:
   portainer:
     image: portainer/portainer-ce:latest
@@ -732,7 +781,6 @@ function joomlaContainer() {
   fi
   # we build the yml file
   cat <<EOF
-version: '2'
 services:
   mariadb${VDM_KEY}:
     image: mariadb:latest
@@ -1317,7 +1365,6 @@ function openssh__TRuST__setup() {
 function opensshContainer() {
   # we build the yml file
   cat <<EOF
-version: "2.1"
 services:
   openssh-server-${VDM_KEY}:
     image: lscr.io/linuxserver/openssh-server
@@ -1339,6 +1386,7 @@ services:
 
 networks:
   openssh:
+    external: true
     name: ${VDM_OPENSSH_GATEWAY:-openssh_gateway}
 EOF
 }
@@ -4017,7 +4065,7 @@ function setJoomlaPassword() {
       'joomla-17082005' 'Enter Joomla User Password')
     # keep asking if empty
     if [ ${#VDM_J_PASSWORD} -le 12 ]; then
-      showError "You must enter a password with more than 4 characters!"
+      showError "You must enter a password with more than 11 characters!"
     fi
   done
   # make sure it is available
@@ -4594,8 +4642,8 @@ function isFunc() {
   declare -F "$1" >/dev/null
 }
 
-# update the host file
+# Update the host file for Linux and macOS
-function updateHostFile() {
+function updateHostFile_unix() {
   # check if we should add to host file
   if allowEditHostFile; then
     # check if already in host file
@@ -4611,8 +4659,8 @@ function updateHostFile() {
   fi
 }
 
-# the manually edit the host file
+# Manually edit the host file for Linux and macOS
-function editHostFile() {
+function editHostFile_unix() {
   # check if we should add to host file
   if allowEditHostFile; then
     # if this container is enabled ask if it should be redeployed
@@ -4626,6 +4674,68 @@ function editHostFile() {
   fi
 }
 
+# Update the host file for Windows (MSYS/Cygwin)
+function updateHostFile_windows() {
+  local subdomain=${1:-$VDM_SUBDOMAIN}
+  local domain=${2:-$VDM_DOMAIN}
+  local host_file="/c/Windows/System32/drivers/etc/hosts"
+
+  if allowEditHostFile; then
+    if grep -q "${subdomain}.${domain}" "$host_file"; then
+      showNotice "${USER^}, ${subdomain}.${domain} is already in the hosts file."
+    elif (whiptail --yesno "${USER^}, to add the ${subdomain}.${domain} entry to your host file we need administrative privileges." \
+      --title "Give administrative Privileges" --backtitle "${BACK_TITLE}" 8 112); then
+      echo "127.0.0.1       ${subdomain}.${domain}" | sudo tee -a "$host_file" >/dev/null
+      showNotice "${USER^}, ${subdomain}.${domain} was added to the hosts file."
+    fi
+  fi
+}
+
+# Manually edit the host file for Windows (MSYS/Cygwin)
+function editHostFile_windows() {
+  local host_file="/c/Windows/System32/drivers/etc/hosts"
+
+  if allowEditHostFile; then
+    if (whiptail --yesno "To edit the host file we need administrative privileges.\n[Only continue if you know what you're doing!]" \
+      --title "Give administrative Privileges" --backtitle "${BACK_TITLE}" 15 112); then
+      showNotice "${USER^}, to save the changes you've made or to just close the file again press:\n\n[ctrl+x] with nano." 13
+      sudo "${EDITOR:-nano}" "$host_file"
+    fi
+  fi
+}
+
+# Update the host file (dynamically calls the correct OS function)
+function updateHostFile() {
+  case "$OS_NUMBER" in
+    1|2)
+      updateHostFile_unix "$@"
+      ;;
+    3)
+      updateHostFile_windows "$@"
+      ;;
+    *)
+      echo >&2 "ERROR: Unsupported operating system."
+      exit 1
+      ;;
+  esac
+}
+
+# Manually edit the host file (dynamically calls the correct OS function)
+function editHostFile() {
+  case "$OS_NUMBER" in
+    1|2)
+      editHostFile_unix
+      ;;
+    3)
+      editHostFile_windows
+      ;;
+    *)
+      echo >&2 "ERROR: Unsupported operating system."
+      exit 1
+      ;;
+  esac
+}
+
 # the manually edit the config file
 function editConfigFile() {
   # check if the file exist