diff --git a/install.sh b/install.sh index 6dca382..5da52aa 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.5.9 +### version: 1.5.10 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # 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.9" #auto-update +SCRIPT_VERSION="1.5.10" #auto-update SCRIPT_BUILD_TIME="2023.09.29" #auto-update #======================================= @@ -1118,9 +1118,12 @@ version_menu() { uninstall_menu() { while :; do + local extraMenu=() + extraMenu+=("A)" "Ustaw adres strony (subdomenę)") local ns_tag=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_NIGHTSCOUT_TAG") - local CHOICE=$(whiptail --title "Zmień lub odinstaluj Nightscout" --menu "\n" 17 70 7 \ - "W)" "Zmień wersję Nightscouta (bieżąca: $ns_tag)" \ + local CHOICE=$(whiptail --title "Zmień lub odinstaluj Nightscout" --menu "\n" 17 70 8 \ + "${extraMenu[@]}" \ + "W)" "Zmień wersję Nightscouta (bieżąca: $ns_tag)" \ "E)" "Edytuj ustawienia (zmienne środowiskowe)" \ "K)" "Usuń kontenery" \ "B)" "Wyczyść bazę danych" \ @@ -1131,6 +1134,9 @@ uninstall_menu() { 3>&2 2>&1 1>&3) case $CHOICE in + "A)") + domain_setup + ;; "W)") version_menu ;; diff --git a/package.json b/package.json index b894f0c..0a11a5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dlvoy/ns-installer-mikrus", - "version": "1.5.9", + "version": "1.5.10", "description": "Nightscout installer for mikr.us VPS", "main": "index.js", "scripts": { diff --git a/src/lib.sh b/src/lib.sh index 47f1c7f..921335a 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.9" #auto-update +SCRIPT_VERSION="1.5.10" #auto-update SCRIPT_BUILD_TIME="2023.09.15" #auto-update #======================================= @@ -1102,9 +1102,12 @@ version_menu() { uninstall_menu() { while :; do + local extraMenu=() + extraMenu+=("A)" "Ustaw adres strony (subdomenę)") local ns_tag=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_NIGHTSCOUT_TAG") - local CHOICE=$(whiptail --title "Zmień lub odinstaluj Nightscout" --menu "\n" 17 70 7 \ - "W)" "Zmień wersję Nightscouta (bieżąca: $ns_tag)" \ + local CHOICE=$(whiptail --title "Zmień lub odinstaluj Nightscout" --menu "\n" 17 70 8 \ + "${extraMenu[@]}" \ + "W)" "Zmień wersję Nightscouta (bieżąca: $ns_tag)" \ "E)" "Edytuj ustawienia (zmienne środowiskowe)" \ "K)" "Usuń kontenery" \ "B)" "Wyczyść bazę danych" \ @@ -1115,6 +1118,9 @@ uninstall_menu() { 3>&2 2>&1 1>&3) case $CHOICE in + "A)") + domain_setup + ;; "W)") version_menu ;; diff --git a/src/setup.sh b/src/setup.sh index 1c1c903..4633f46 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.5.9 +### version: 1.5.10 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # diff --git a/updated b/updated index c85b99d..a5fee83 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2023-09-29T08:48:28.952Z \ No newline at end of file +2023-09-29T10:26:58.785Z \ No newline at end of file