From ba5ef451e6cb54fe584e861444d4cb5a60590ac5 Mon Sep 17 00:00:00 2001 From: Dominik Dzienia Date: Mon, 4 Sep 2023 13:13:22 +0000 Subject: [PATCH] Detect Node.js post-install state --- install.sh | 34 ++++++++++++++++++++++++---------- package.json | 2 +- src/lib.sh | 32 +++++++++++++++++++++++--------- src/setup.sh | 2 +- updated | 2 +- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/install.sh b/install.sh index 6c2059e..53bc50f 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.3.1 +### version: 1.3.2 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # @@ -33,7 +33,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.3.1" #auto-update +SCRIPT_VERSION="1.3.2" #auto-update SCRIPT_BUILD_TIME="2023.09.04" #auto-update #======================================= @@ -405,19 +405,33 @@ setup_node() { if [ $RESULT -eq 0 ]; then msgcheck "Node installed in correct version" else - ohai "Cleaning old Node.js" - - rm -f /etc/apt/sources.list.d/nodesource.list 2> /dev/null - - apt-get -yq --fix-broken install - apt-get -yq update - apt-get -yq remove nodejs nodejs-doc libnode* + # ohai "Cleaning old Node.js" + # { + # rm -f /etc/apt/sources.list.d/nodesource.list + # apt-get -yq --fix-broken install + # apt-get -yq update + # apt-get -yq remove nodejs nodejs-doc libnode* + # } >>$LOGTO 2>&1 ohai "Preparing Node.js setup" curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - >/dev/null 2>&1 ohai "Installing Node.js" apt-get install -y nodejs >>$LOGTO 2>&1 + + test_node + local RECHECK=$? + if [ $RECHECK -ne 0 ]; then + + msgerr "Nie udało się zainstalować Node.js" + + msgerr "Instalacja Node.js jest skomplikowanym procesem i zależy od wersji systemu Linux i konfiguracji Mikr.us-a" + msgerr "Spróbuj ręcznie uruchomić instalację poniższą komendą i sprawdź czy pojawiają się błędy (i jakie):" + msgerr " apt-get install -y nodejs " + + exit 1 + fi + fi } @@ -1123,7 +1137,7 @@ install_or_menu() { docker_compose_up setup_firewall_for_ns domain_setup - admin_panel_promo + # admin_panel_promo setup_done else main_menu diff --git a/package.json b/package.json index 2c076f0..fd9db08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dlvoy/ns-installer-mikrus", - "version": "1.3.1", + "version": "1.3.2", "description": "Nightscout installer for mikr.us VPS", "main": "index.js", "scripts": { diff --git a/src/lib.sh b/src/lib.sh index f355b17..9a9501d 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -17,7 +17,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.3.1" #auto-update +SCRIPT_VERSION="1.3.2" #auto-update SCRIPT_BUILD_TIME="2023.09.04" #auto-update #======================================= @@ -389,19 +389,33 @@ setup_node() { if [ $RESULT -eq 0 ]; then msgcheck "Node installed in correct version" else - ohai "Cleaning old Node.js" - - rm -f /etc/apt/sources.list.d/nodesource.list 2> /dev/null - - apt-get -yq --fix-broken install - apt-get -yq update - apt-get -yq remove nodejs nodejs-doc libnode* + # ohai "Cleaning old Node.js" + # { + # rm -f /etc/apt/sources.list.d/nodesource.list + # apt-get -yq --fix-broken install + # apt-get -yq update + # apt-get -yq remove nodejs nodejs-doc libnode* + # } >>$LOGTO 2>&1 ohai "Preparing Node.js setup" curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - >/dev/null 2>&1 ohai "Installing Node.js" apt-get install -y nodejs >>$LOGTO 2>&1 + + test_node + local RECHECK=$? + if [ $RECHECK -ne 0 ]; then + + msgerr "Nie udało się zainstalować Node.js" + + msgerr "Instalacja Node.js jest skomplikowanym procesem i zależy od wersji systemu Linux i konfiguracji Mikr.us-a" + msgerr "Spróbuj ręcznie uruchomić instalację poniższą komendą i sprawdź czy pojawiają się błędy (i jakie):" + msgerr " apt-get install -y nodejs " + + exit 1 + fi + fi } @@ -1107,7 +1121,7 @@ install_or_menu() { docker_compose_up setup_firewall_for_ns domain_setup - admin_panel_promo + # admin_panel_promo setup_done else main_menu diff --git a/src/setup.sh b/src/setup.sh index 5934905..c200884 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.3.1 +### version: 1.3.2 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # diff --git a/updated b/updated index 583afe1..c6d2deb 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2023-09-04T11:29:41.442Z \ No newline at end of file +2023-09-04T13:12:07.021Z \ No newline at end of file