shared
/
mikrus-installer
2
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Debug release 1.10.5

Browse Source
develop
Dominik Dzienia 3 weeks ago
parent 20aef9777c
commit 5275f9517a
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File

24
install.sh
Unescape Escape View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
### version: 1.10.4 ### version: 1.10.5
# ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
# Nightscout Mikr.us setup script # # Nightscout Mikr.us setup script #
@ -16,7 +16,7 @@
# This file is automatically generated. Do not modify it directly! # This file is automatically generated. Do not modify it directly!
# Instead, modify the source files in the src directory and run the build script! # Instead, modify the source files in the src directory and run the build script!
# #
# Build time: 2026.01.06 16:35 # Build time: 2026.01.06 16:48
@ -61,7 +61,7 @@ DISK_LOW_MAIL=5184000 # == 60 days in seconds
DISK_CRITICAL_WARNING=104857600 # == 100 MiB DISK_CRITICAL_WARNING=104857600 # == 100 MiB
DISK_CRITICAL_MAIL=604800 # == 7 days in seconds DISK_CRITICAL_MAIL=604800 # == 7 days in seconds
DOCKER_DOWN_MAIL=604800 # == 7 days in seconds DOCKER_DOWN_MAIL=604800 # == 7 days in seconds
SCRIPT_VERSION="1.10.4" #auto-update SCRIPT_VERSION="1.10.5" #auto-update
SCRIPT_BUILD_TIME="2026.01.06" #auto-update SCRIPT_BUILD_TIME="2026.01.06" #auto-update
FORCE_DEBUG_LOG="" FORCE_DEBUG_LOG=""
NONINTERACTIVE_MODE="false" NONINTERACTIVE_MODE="false"
@ -1121,14 +1121,21 @@ add_if_not_ok_cmd() {
} }
add_if_not_ok_compose() { add_if_not_ok_compose() {
#shellcheck disable=SC2319
local RESULT=$? local RESULT=$?
if [ "$#" -eq 2 ]; then
RESULT=$2
fi
if [ "$RESULT" -eq 0 ]; then if [ "$RESULT" -eq 0 ]; then
msgcheck "$1 installed" msgcheck "$1 installed"
else else
ohai "Installing $1..." ohai "Installing $1..."
mkdir -p "~/.docker/cli-plugins" >>"$LOGTO" 2>&1 {
curl -SL "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" -o "~/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1 mkdir -p "$HOME/.docker/cli-plugins"
chmod +x "~/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1 curl -SL "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" -o "$HOME/.docker/cli-plugins/docker-compose"
} >>"$LOGTO" 2>&1
chmod +x "$HOME/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1
msgcheck "Installing $1 successfull" msgcheck "Installing $1 successfull"
fi fi
} }
@ -1151,11 +1158,10 @@ check_docker() {
check_docker_compose() { check_docker_compose() {
local version_output local version_output
version_output="$(docker compose version)" version_output="$(docker compose version 2>&1)"
# check if output has 'unknown' in it # check if output has 'unknown' in it
if [[ "$version_output" == *"unknown"* ]]; then if [[ "$version_output" == *"unknown"* ]]; then
$?=-1 add_if_not_ok_compose "Docker compose" "force"
add_if_not_ok_compose "Docker compose"
else else
msgcheck "Docker compose installed" msgcheck "Docker compose installed"
fi fi

2
package.json
Unescape Escape View File

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

18
src/logic_setup_checks.sh
Unescape Escape View File

@ -35,14 +35,21 @@ add_if_not_ok_cmd() {
} }
add_if_not_ok_compose() { add_if_not_ok_compose() {
#shellcheck disable=SC2319
local RESULT=$? local RESULT=$?
if [ "$#" -eq 2 ]; then
RESULT=$2
fi
if [ "$RESULT" -eq 0 ]; then if [ "$RESULT" -eq 0 ]; then
msgcheck "$1 installed" msgcheck "$1 installed"
else else
ohai "Installing $1..." ohai "Installing $1..."
mkdir -p "~/.docker/cli-plugins" >>"$LOGTO" 2>&1 {
curl -SL "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" -o "~/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1 mkdir -p "$HOME/.docker/cli-plugins"
chmod +x "~/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1 curl -SL "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" -o "$HOME/.docker/cli-plugins/docker-compose"
} >>"$LOGTO" 2>&1
chmod +x "$HOME/.docker/cli-plugins/docker-compose" >>"$LOGTO" 2>&1
msgcheck "Installing $1 successfull" msgcheck "Installing $1 successfull"
fi fi
} }
@ -65,11 +72,10 @@ check_docker() {
check_docker_compose() { check_docker_compose() {
local version_output local version_output
version_output="$(docker compose version)" version_output="$(docker compose version 2>&1)"
# check if output has 'unknown' in it # check if output has 'unknown' in it
if [[ "$version_output" == *"unknown"* ]]; then if [[ "$version_output" == *"unknown"* ]]; then
$?=-1 add_if_not_ok_compose "Docker compose" "force"
add_if_not_ok_compose "Docker compose"
else else
msgcheck "Docker compose installed" msgcheck "Docker compose installed"
fi fi

2
updated
Unescape Escape View File

@ -1 +1 @@
2026-01-06T16:35:48.974Z 2026-01-06T16:48:37.571Z
Write Preview
Loading…
Cancel
Save