From 8945316ce660ade855aa7da379a87187489a1662 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sat, 19 Aug 2023 21:01:37 +0200 Subject: [PATCH 01/24] added helptexs to the installation script (#3603) --- extra/install.batsh | 9 +++++++-- install.sh | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/extra/install.batsh b/extra/install.batsh index 84099202..e2f9a751 100644 --- a/extra/install.batsh +++ b/extra/install.batsh @@ -189,13 +189,15 @@ if (type == "local") { bash("check=$(git --version)"); if (check == "") { error = 1; - println("Error: git is missing"); + println("Error: git is not found!"); + println("help: an installation guide is available at https://git-scm.com/book/en/v2/Getting-Started-Installing-Git"); } bash("check=$(node -v)"); if (check == "") { error = 1; - println("Error: node is missing"); + println("Error: node is not found"); + println("help: an installation guide is available at https://nodejs.org/en/download"); } if (error > 0) { @@ -216,6 +218,7 @@ if (type == "local") { bash("check=$(pm2 --version)"); if (check == "") { println("Error: pm2 is not found!"); + println("help: an installation guide is available at https://pm2.keymetrics.io/docs/usage/quick-start/"); bash("exit 1"); } @@ -232,6 +235,7 @@ if (type == "local") { bash("check=$(docker -v)"); if (check == "") { println("Error: docker is not found!"); + println("help: an installation guide is available at https://docs.docker.com/desktop/"); bash("exit 1"); } @@ -239,6 +243,7 @@ if (type == "local") { bash("if [[ \"$check\" == *\"Is the docker daemon running\"* ]]; then \"echo\" \"Error: docker is not running\" + \"echo\" \"help: a troubleshooting guide is available at https://docs.docker.com/config/daemon/troubleshoot/\" \"exit\" \"1\" fi"); diff --git a/install.sh b/install.sh index a206e558..d965867c 100644 --- a/install.sh +++ b/install.sh @@ -156,12 +156,14 @@ fi check=$(git --version) if [ "$check" == "" ]; then error=$((1)) - "echo" "-e" "Error: git is missing" + "echo" "-e" "Error: git is not found!" + "echo" "-e" "help: an installation guide is available at https://git-scm.com/book/en/v2/Getting-Started-Installing-Git" fi check=$(node -v) if [ "$check" == "" ]; then error=$((1)) - "echo" "-e" "Error: node is missing" + "echo" "-e" "Error: node is not found" + "echo" "-e" "help: an installation guide is available at https://nodejs.org/en/download" fi if [ $(($error > 0)) == 1 ]; then "echo" "-e" "Please install above missing software" @@ -180,6 +182,7 @@ fi check=$(pm2 --version) if [ "$check" == "" ]; then "echo" "-e" "Error: pm2 is not found!" + "echo" "-e" "help: an installation guide is available at https://pm2.keymetrics.io/docs/usage/quick-start/" exit 1 fi mkdir -p $installPath @@ -192,11 +195,13 @@ else check=$(docker -v) if [ "$check" == "" ]; then "echo" "-e" "Error: docker is not found!" + "echo" "-e" "help: an installation guide is available at https://docs.docker.com/desktop/" exit 1 fi check=$(docker info) if [[ "$check" == *"Is the docker daemon running"* ]]; then "echo" "Error: docker is not running" + "echo" "help: a troubleshooting guide is available at https://docs.docker.com/config/daemon/troubleshoot/" "exit" "1" fi if [ "$3" != "" ]; then From 7bfdb82f5da139d1d79016e5ea66623682186ec9 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sat, 19 Aug 2023 22:40:12 +0200 Subject: [PATCH 02/24] bug: fixed the curser being a pointer if hovering above the `dropdown-item`'s (#3607) * fixed the curser being a pointer if hovering above the `dropdown-item`'s * formatting fix --- src/components/MonitorListFilter.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/MonitorListFilter.vue b/src/components/MonitorListFilter.vue index dbb1eb94..c7598cfd 100644 --- a/src/components/MonitorListFilter.vue +++ b/src/components/MonitorListFilter.vue @@ -258,6 +258,10 @@ export default {