Fixed profanity check

profanity
Dominik Dzienia 2 years ago
parent 3f982f813e
commit 8da669c038

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
### version: 1.5.6 ### version: 1.5.7
# ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
# Nightscout Mikr.us setup script # # Nightscout Mikr.us setup script #
@ -34,8 +34,8 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb
TOOL_FILE=/srv/nightscout/tools/nightscout-tool TOOL_FILE=/srv/nightscout/tools/nightscout-tool
TOOL_LINK=/usr/bin/nightscout-tool TOOL_LINK=/usr/bin/nightscout-tool
UPDATES_DIR=/srv/nightscout/updates UPDATES_DIR=/srv/nightscout/updates
SCRIPT_VERSION="1.5.6" #auto-update SCRIPT_VERSION="1.5.7" #auto-update
SCRIPT_BUILD_TIME="2023.09.19" #auto-update SCRIPT_BUILD_TIME="2023.09.29" #auto-update
#======================================= #=======================================
# SETUP # SETUP
@ -905,7 +905,7 @@ domain_setup() {
if [[ "$SUBDOMAIN" =~ ^[a-z][a-zA-Z0-9_]{3,11}$ ]]; then 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" \ 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" "Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
SUBDOMAIN='' SUBDOMAIN=''

@ -1,6 +1,6 @@
{ {
"name": "@dlvoy/ns-installer-mikrus", "name": "@dlvoy/ns-installer-mikrus",
"version": "1.5.6", "version": "1.5.7",
"description": "Nightscout installer for mikr.us VPS", "description": "Nightscout installer for mikr.us VPS",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

@ -18,7 +18,7 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb
TOOL_FILE=/srv/nightscout/tools/nightscout-tool TOOL_FILE=/srv/nightscout/tools/nightscout-tool
TOOL_LINK=/usr/bin/nightscout-tool TOOL_LINK=/usr/bin/nightscout-tool
UPDATES_DIR=/srv/nightscout/updates 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 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 [[ "$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" \ 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" "Podana wartość:\n$SUBDOMAIN\n\njest zajęta, zarezerwowana lub niedopuszczalna.\n\nWymyśl coś innego"
SUBDOMAIN='' SUBDOMAIN=''

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
### version: 1.5.6 ### version: 1.5.7
# ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
# Nightscout Mikr.us setup script # # Nightscout Mikr.us setup script #

@ -1 +1 @@
2023-09-19T07:43:44.441Z 2023-09-29T07:38:18.303Z
Loading…
Cancel
Save