From f4c0b302d29106fa2ddd3cd2de3482d96646b8f7 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dominik.dzienia@gmail.com>
Date: Fri, 29 Sep 2023 08:48:58 +0000
Subject: [PATCH] More on profanity check

---
 install.sh            | 10 +++++-----
 package.json          |  2 +-
 src/lib.sh            |  8 ++++----
 src/setup.sh          |  2 +-
 templates/reserved.db |  2 ++
 updated               |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index e4bf586..6dca382 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.5.8
+### version: 1.5.9
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
@@ -35,7 +35,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.8"         #auto-update
+SCRIPT_VERSION="1.5.9"         #auto-update
 SCRIPT_BUILD_TIME="2023.09.29" #auto-update
 
 #=======================================
@@ -909,16 +909,16 @@ 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" "$SUBDOMAIN" | grep -f "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then
 					okdlg "$uni_excl Nieprawidłowa subdomena $uni_excl" \
 						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
 					SUBDOMAIN=''
 					continue
 				fi
 
-				if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -xf "$RESERVED_DB_FILE" >>$LOGTO 2>&1; then
+				if printf "%s" "$SUBDOMAIN" | grep -xf "$RESERVED_DB_FILE" >>$LOGTO 2>&1; then
 					okdlg "$uni_excl Nieprawidłowa subdomena $uni_excl" \
-						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
+						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta lub zarezerwowana.\n\nWymyśl coś innego"
 					SUBDOMAIN=''
 					continue
 				fi
diff --git a/package.json b/package.json
index 8652dbc..b894f0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dlvoy/ns-installer-mikrus",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "Nightscout installer for mikr.us VPS",
   "main": "index.js",
   "scripts": {
diff --git a/src/lib.sh b/src/lib.sh
index fc98dd3..47f1c7f 100644
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -19,7 +19,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.8"         #auto-update
+SCRIPT_VERSION="1.5.9"         #auto-update
 SCRIPT_BUILD_TIME="2023.09.15" #auto-update
 
 #=======================================
@@ -893,16 +893,16 @@ 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" "$SUBDOMAIN" | grep -f "$PROFANITY_DB_FILE" >>$LOGTO 2>&1; then
 					okdlg "$uni_excl Nieprawidłowa subdomena $uni_excl" \
 						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
 					SUBDOMAIN=''
 					continue
 				fi
 
-				if printf "%s\n%s" "-$SUBDOMAIN" "$SUBDOMAIN" | grep -xf "$RESERVED_DB_FILE" >>$LOGTO 2>&1; then
+				if printf "%s" "$SUBDOMAIN" | grep -xf "$RESERVED_DB_FILE" >>$LOGTO 2>&1; then
 					okdlg "$uni_excl Nieprawidłowa subdomena $uni_excl" \
-						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
+						"Podana wartość:\n$SUBDOMAIN\n\njest zajęta lub zarezerwowana.\n\nWymyśl coś innego"
 					SUBDOMAIN=''
 					continue
 				fi
diff --git a/src/setup.sh b/src/setup.sh
index b14defb..1c1c903 100755
--- a/src/setup.sh
+++ b/src/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.5.7
+### version: 1.5.9
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
diff --git a/templates/reserved.db b/templates/reserved.db
index be0f4f8..1ee2684 100644
--- a/templates/reserved.db
+++ b/templates/reserved.db
@@ -9,11 +9,13 @@ bartosz
 beata
 benedykt
 centki
+cukrzycki.*
 dolata.*
 dominik
 dorota
 dubrowska.*
 dubrowski.*
+dzienia.*
 ejdz.*
 elzbieta
 ewelina
diff --git a/updated b/updated
index c7d9d2e..c85b99d 100644
--- a/updated
+++ b/updated
@@ -1 +1 @@
-2023-09-29T08:34:34.704Z
\ No newline at end of file
+2023-09-29T08:48:28.952Z
\ No newline at end of file