Merge pull request #112 from buildplan/111-silent-crash-after-incorrect-timezone

fix: silent crash after incorrect timezone

Author: buildplan

README.md

@@ -7,9 +7,9 @@
 
 -----
 
-**Version:** v0.80.4
+**Version:** v0.80.5
 
-**Last Updated:** 2026-03-09
+**Last Updated:** 2026-03-26
 
 **Compatible With:**
 
@@ -88,12 +88,12 @@ sha256sum du_setup.sh
 
 Compare the output hash to the one below. They must match exactly.
 
-`f32dafe3170045b35cf3b20fe00b6689e192f2bfaa1b6879277b42ca40854bd5`
+`f6c7047a052fc795612dadc6e72871dc756c30c87698a302fc7c46c1e3582bda`
 
 Or echo the hash to check, it should output: `du_setup.sh: OK`
 
 ```bash
-echo f32dafe3170045b35cf3b20fe00b6689e192f2bfaa1b6879277b42ca40854bd5 du_setup.sh | sha256sum --check
+echo f6c7047a052fc795612dadc6e72871dc756c30c87698a302fc7c46c1e3582bda du_setup.sh | sha256sum --check
 ```
 
 ### 3. Run the Script

du_setup.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
 # Debian and Ubuntu Server Hardening Interactive Script
-# Version: 0.80.4 | 2026-03-09
+# Version: 0.80.5 | 2026-03-26
 # Changelog:
+# - v0.80.5: Fixed a crash in timezone validation by checking for files (-f) instead of directories.
+#            Resolved unexpected set -e terminations during 'pretty hostname' assignment and SSH port detection.
 # - v0.80.4: Warn and finish the script if Docker, Tailscale and Netbird fail to install properly. 
 # - v0.80.3: Warn about password-less sudo and offer to generate password for the user if they choose to do so.
 #            Improve SSH service detection for Debian systems.
@@ -106,7 +108,7 @@
 set -euo pipefail
 
 # --- Update Configuration ---
-CURRENT_VERSION="0.80.4"
+CURRENT_VERSION="0.80.5"
 SCRIPT_URL="https://raw.githubusercontent.com/buildplan/du_setup/refs/heads/main/du_setup.sh"
 CHECKSUM_URL="${SCRIPT_URL}.sha256"
 
@@ -270,7 +272,7 @@ print_header() {
     printf '%s\n' "${CYAN}╔═════════════════════════════════════════════════════════════════╗${NC}"
     printf '%s\n' "${CYAN}║                                                                 ║${NC}"
     printf '%s\n' "${CYAN}║       DEBIAN/UBUNTU SERVER SETUP AND HARDENING SCRIPT           ║${NC}"
-    printf '%s\n' "${CYAN}║                      v0.80.4 | 2026-03-09                       ║${NC}"
+    printf '%s\n' "${CYAN}║                      v0.80.5 | 2026-03-26                       ║${NC}"
     printf '%s\n' "${CYAN}║                                                                 ║${NC}"
     printf '%s\n' "${CYAN}╚═════════════════════════════════════════════════════════════════╝${NC}"
     printf '\n'
@@ -2607,7 +2609,7 @@ validate_ssh_key() {
 
 validate_timezone() {
     local tz="$1"
-    [[ -e "/usr/share/zoneinfo/$tz" ]]
+    [[ -f "/usr/share/zoneinfo/$tz" ]]
 }
 
 validate_ufw_port() {
@@ -2882,9 +2884,9 @@ collect_config() {
         if validate_hostname "$SERVER_NAME"; then break; else print_error "Invalid hostname."; fi
     done
     read -rp "$(printf '%s' "${CYAN}Enter a 'pretty' hostname (optional): ${NC}")" PRETTY_NAME
-    [[ -z "$PRETTY_NAME" ]] && PRETTY_NAME="$SERVER_NAME"
+    PRETTY_NAME="${PRETTY_NAME:-$SERVER_NAME}"
     # --- SSH Port Detection ---
-    PREVIOUS_SSH_PORT=$(ss -tlpn | grep -E 'sshd|ssh\.socket' | awk '{print $4}' | grep -oP ':\K\d+' | grep -vE '^60[1-9][0-9]$' | head -n 1)
+    PREVIOUS_SSH_PORT=$(ss -tlpn | grep -E 'sshd|ssh\.socket' | awk '{print $4}' | grep -oP ':\K\d+' | grep -vE '^60[1-9][0-9]$' | head -n 1 || true)
     local PROMPT_DEFAULT_PORT=${PREVIOUS_SSH_PORT:-2222}
     while true; do
         read -rp "$(printf '%s' "${CYAN}Enter custom SSH port (1024-65535) [$PROMPT_DEFAULT_PORT]: ${NC}")" SSH_PORT

du_setup.sh.sha256

@@ -1 +1 @@
-f32dafe3170045b35cf3b20fe00b6689e192f2bfaa1b6879277b42ca40854bd5  du_setup.sh
+f6c7047a052fc795612dadc6e72871dc756c30c87698a302fc7c46c1e3582bda  du_setup.sh