diff --git a/CHANGELOG.md b/CHANGELOG.md index 45d426d..81be7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.9.3] - 2025-03-19 + +### Fixed + +- Detecting mikr.us API key / hostname + ## [1.9.2] - 2025-03-13 ### Changed diff --git a/install.sh b/install.sh index dcc522c..9f054a0 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.9.2 +### version: 1.9.3 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # 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.2" #auto-update -SCRIPT_BUILD_TIME="2025.03.13" #auto-update +SCRIPT_VERSION="1.9.3" #auto-update +SCRIPT_BUILD_TIME="2025.03.18" #auto-update #======================================= # SETUP @@ -1367,7 +1367,7 @@ prompt_mikrus_apikey() { MIKRUS_APIKEY=$(cat "/klucz_api") MIKRUS_INFO_HOST=$(curl -s -d "srv=$MIKRUS_HOST&key=$MIKRUS_APIKEY" -X POST https://api.mikr.us/info | jq -r .server_id) - if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then + if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]] || [[ "$MIKRUS_INFO_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then msgcheck "Mikrus OK" else MIKRUS_APIKEY="" @@ -1385,7 +1385,7 @@ prompt_mikrus_apikey() { if [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then MIKRUS_INFO_HOST=$(curl -s -d "srv=$MIKRUS_HOST&key=$MIKRUS_APIKEY" -X POST https://api.mikr.us/info | jq -r .server_id) - if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then + if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]] || [[ "$MIKRUS_INFO_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then msgcheck "Mikrus OK" break else diff --git a/package.json b/package.json index 57b7669..00cc8f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dlvoy/ns-installer-mikrus", - "version": "1.9.2", + "version": "1.9.3", "description": "Nightscout installer for mikr.us VPS", "main": "index.js", "scripts": { diff --git a/src/lib.sh b/src/lib.sh index 2dbd0b2..ccf67cf 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -38,7 +38,7 @@ 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_VERSION="1.9.3" #auto-update SCRIPT_BUILD_TIME="2024.10.26" #auto-update #======================================= @@ -1351,7 +1351,7 @@ prompt_mikrus_apikey() { MIKRUS_APIKEY=$(cat "/klucz_api") MIKRUS_INFO_HOST=$(curl -s -d "srv=$MIKRUS_HOST&key=$MIKRUS_APIKEY" -X POST https://api.mikr.us/info | jq -r .server_id) - if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then + if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]] || [[ "$MIKRUS_INFO_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then msgcheck "Mikrus OK" else MIKRUS_APIKEY="" @@ -1369,7 +1369,7 @@ prompt_mikrus_apikey() { if [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then MIKRUS_INFO_HOST=$(curl -s -d "srv=$MIKRUS_HOST&key=$MIKRUS_APIKEY" -X POST https://api.mikr.us/info | jq -r .server_id) - if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then + if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]] || [[ "$MIKRUS_INFO_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then msgcheck "Mikrus OK" break else diff --git a/src/setup.sh b/src/setup.sh index 6aae908..72d3f34 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.9.2 +### version: 1.9.3 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # diff --git a/updated b/updated index 317ea8b..1b2e91c 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2025-03-13T13:20:10.412Z \ No newline at end of file +2025-03-18T23:21:17.503Z \ No newline at end of file