diff --git a/install.sh b/install.sh index e7cac13..2cceef6 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.5.6 +### version: 1.5.7 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # @@ -34,8 +34,8 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb TOOL_FILE=/srv/nightscout/tools/nightscout-tool TOOL_LINK=/usr/bin/nightscout-tool UPDATES_DIR=/srv/nightscout/updates -SCRIPT_VERSION="1.5.6" #auto-update -SCRIPT_BUILD_TIME="2023.09.19" #auto-update +SCRIPT_VERSION="1.5.7" #auto-update +SCRIPT_BUILD_TIME="2023.09.29" #auto-update #======================================= # SETUP @@ -905,7 +905,7 @@ domain_setup() { if [[ "$SUBDOMAIN" =~ ^[a-z][a-zA-Z0-9_]{3,11}$ ]]; then - if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -wf "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then + if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -wfx "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then okdlg "$uni_excl Nieprawidłowy początek subdomeny $uni_excl" \ "Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego" SUBDOMAIN='' diff --git a/package.json b/package.json index 1d1ebb5..21e6402 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dlvoy/ns-installer-mikrus", - "version": "1.5.6", + "version": "1.5.7", "description": "Nightscout installer for mikr.us VPS", "main": "index.js", "scripts": { diff --git a/src/lib.sh b/src/lib.sh index 5deae23..6daece3 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -18,7 +18,7 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb TOOL_FILE=/srv/nightscout/tools/nightscout-tool TOOL_LINK=/usr/bin/nightscout-tool UPDATES_DIR=/srv/nightscout/updates -SCRIPT_VERSION="1.5.6" #auto-update +SCRIPT_VERSION="1.5.7" #auto-update SCRIPT_BUILD_TIME="2023.09.15" #auto-update #======================================= @@ -889,7 +889,7 @@ domain_setup() { if [[ "$SUBDOMAIN" =~ ^[a-z][a-zA-Z0-9_]{3,11}$ ]]; then - if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -wf "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then + if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -wfx "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then okdlg "$uni_excl Nieprawidłowy początek subdomeny $uni_excl" \ "Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego" SUBDOMAIN='' diff --git a/src/setup.sh b/src/setup.sh index 03fd0ea..b14defb 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.5.6 +### version: 1.5.7 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # diff --git a/updated b/updated index 4344550..3dc84ed 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2023-09-19T07:43:44.441Z \ No newline at end of file +2023-09-29T07:38:18.303Z \ No newline at end of file