Merge pull request #3 from telnetdoogie/fix_version_error

changed version match to no longer be an 'ERROR'
telnetdoogie · Nov 3, 2024 · 04ee3bd · 04ee3bd
2 parents 1f38d8b + 815f5b1
commit 04ee3bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/syno_docker_update.sh b/syno_docker_update.sh
@@ -27,6 +27,12 @@ terminate() {
     exit 1
 }
 
+terminate_with_warning() {
+    printf "${RED}${BOLD}%s${NC}\n" "Exiting - $1"
+    exit 1
+}
+
+
 #======================================================================================================================
 # Constants
 #======================================================================================================================
@@ -493,7 +499,7 @@ define_update() {
     if [ "${force}" != 'true' ] ; then
         if [ "${docker_version}" = "${target_docker_version}" ] && \
             [ "${compose_version}" = "${target_compose_version}" ] ; then
-            terminate "Already on target version for Docker and Docker Compose"
+            terminate_with_warning "Already on target version for Docker and Docker Compose"
         fi
         if [ "${docker_version}" = "${target_docker_version}" ] && [ "${skip_docker_update}" = 'false' ] ; then
             skip_docker_update='true'

diff --git a/test_list.sh b/test_list.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker inspect jellyfin --format "{{.Name}} {{if index .Config.Labels \"com.docker.compose.project.config_files\"}}{{index .Config.Labels \"com.docker.compose.project.config_files\"}}{{else}}CONFIG NOT FOUND{{end}} {{.HostConfig.LogConfig.Type}}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		docker inspect jellyfin --format "{{.Name}} {{if index .Config.Labels \"com.docker.compose.project.config_files\"}}{{index .Config.Labels \"com.docker.compose.project.config_files\"}}{{else}}CONFIG NOT FOUND{{end}} {{.HostConfig.LogConfig.Type}}"