From 4c61632e3d389d4cfa1f66e9689660e18fc8899a Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dominik.dzienia@gmail.com>
Date: Thu, 13 Mar 2025 08:18:07 +0000
Subject: [PATCH] Support for new mikr.us hostname naming scheme

---
 install.sh   | 24 +++++++++++++-----------
 package.json |  2 +-
 src/lib.sh   | 18 ++++++++++--------
 src/setup.sh |  2 +-
 updated      |  2 +-
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/install.sh b/install.sh
index 8758e55..50e1bf8 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.9.1
+### version: 1.9.2
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
@@ -54,8 +54,8 @@ DISK_LOW_MAIL=5184000           # == 60 days in seconds
 DISK_CRITICAL_WARNING=104857600 # == 100 MiB
 DISK_CRITICAL_MAIL=604800       # == 7 days in seconds
 DOCKER_DOWN_MAIL=604800         # == 7 days in seconds
-SCRIPT_VERSION="1.9.1"          #auto-update
-SCRIPT_BUILD_TIME="2024.10.26"  #auto-update
+SCRIPT_VERSION="1.9.2"          #auto-update
+SCRIPT_BUILD_TIME="2025.03.13"  #auto-update
 
 #=======================================
 # SETUP
@@ -940,11 +940,13 @@ setup_firewall() {
 	} >>"$LOGTO" 2>&1
 
 	host=$(hostname)
-	host=${host:1}
-
-	port1=$((10000 + host))
-	port2=$((20000 + host))
-	port3=$((30000 + host))
+  
+  # Extract the last 3 digits from the hostname
+  port_number=$(echo "$host" | grep -oE '[0-9]{3}$')
+	
+	port1=$((10000 + port_number))
+	port2=$((20000 + port_number))
+  port3=$((30000 + port_number))
 
 	if ufw allow "$port1" >>"$LOGTO" 2>&1; then
 		msgcheck "Do regul firewalla poprawnie dodano port $port1"
@@ -1334,15 +1336,15 @@ instal_now_prompt() {
 }
 
 prompt_mikrus_host() {
-	if ! [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+	if ! [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 		MIKRUS_HOST=$(hostname)
 		while :; do
-			if [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+			if [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 				break
 			else
 				MIKRUS_NEW_HOST=$(whiptail --title "Podaj identyfikator serwera" --inputbox "\nNie udało się wykryć identyfikatora serwera,\npodaj go poniżej ręcznie.\n\nIdentyfikator składa się z jednej litery i trzech cyfr\n" --cancel-button "Anuluj" 13 65 3>&1 1>&2 2>&3)
 				exit_on_no_cancel
-				if [[ "$MIKRUS_NEW_HOST" =~ [a-z][0-9]{3} ]]; then
+				if [[ "$MIKRUS_NEW_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 					MIKRUS_HOST=$MIKRUS_NEW_HOST
 					break
 				else
diff --git a/package.json b/package.json
index 92f6d54..57b7669 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dlvoy/ns-installer-mikrus",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Nightscout installer for mikr.us VPS",
   "main": "index.js",
   "scripts": {
diff --git a/src/lib.sh b/src/lib.sh
index 3fa7bb2..aae1e13 100644
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -924,11 +924,13 @@ setup_firewall() {
 	} >>"$LOGTO" 2>&1
 
 	host=$(hostname)
-	host=${host:1}
-
-	port1=$((10000 + host))
-	port2=$((20000 + host))
-	port3=$((30000 + host))
+  
+  # Extract the last 3 digits from the hostname
+  port_number=$(echo "$host" | grep -oE '[0-9]{3}$')
+	
+	port1=$((10000 + port_number))
+	port2=$((20000 + port_number))
+  port3=$((30000 + port_number))
 
 	if ufw allow "$port1" >>"$LOGTO" 2>&1; then
 		msgcheck "Do regul firewalla poprawnie dodano port $port1"
@@ -1318,15 +1320,15 @@ instal_now_prompt() {
 }
 
 prompt_mikrus_host() {
-	if ! [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+	if ! [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 		MIKRUS_HOST=$(hostname)
 		while :; do
-			if [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+			if [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 				break
 			else
 				MIKRUS_NEW_HOST=$(whiptail --title "Podaj identyfikator serwera" --inputbox "\nNie udało się wykryć identyfikatora serwera,\npodaj go poniżej ręcznie.\n\nIdentyfikator składa się z jednej litery i trzech cyfr\n" --cancel-button "Anuluj" 13 65 3>&1 1>&2 2>&3)
 				exit_on_no_cancel
-				if [[ "$MIKRUS_NEW_HOST" =~ [a-z][0-9]{3} ]]; then
+				if [[ "$MIKRUS_NEW_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 					MIKRUS_HOST=$MIKRUS_NEW_HOST
 					break
 				else
diff --git a/src/setup.sh b/src/setup.sh
index 68c8a44..6aae908 100755
--- a/src/setup.sh
+++ b/src/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.9.1
+### version: 1.9.2
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
diff --git a/updated b/updated
index 038a788..9e4218e 100644
--- a/updated
+++ b/updated
@@ -1 +1 @@
-2024-10-26T08:38:49.153Z
\ No newline at end of file
+2025-03-13T08:16:45.507Z
\ No newline at end of file