From b47dde4fae81b95d2dc0228eb251b8e2b99a914b Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:07:59 +0900
Subject: [PATCH 1/6] add: return code to load_config(1 is skip)

---
 compose-cd | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compose-cd b/compose-cd
index 16873fa..2f2b887 100755
--- a/compose-cd
+++ b/compose-cd
@@ -108,6 +108,9 @@ function load_global_config() {
 }
 
 function load_config() {
+	local ret
+	ret=0
+
 	compose_log echo -n "[$proj:load config] "
 	if [ ! -e ./.compose-cd ]; then
 		compose_log echo "config file not found"
@@ -136,6 +139,7 @@ function load_config() {
 	fi
 
 	compose_log echo "ok"
+	return $ret
 }
 
 function service_up() {
@@ -361,6 +365,7 @@ function update_image() {
 
 function project_update() {
 	local proj=$1
+	local rc
 	local rr
 	local ri
 
@@ -368,6 +373,12 @@ function project_update() {
 	local after_script
 
 	load_config
+	rc=$?
+	if [ $rc = 1 ]; then
+		# skip update
+		compose_log echo "skip update"
+		return
+	fi
 
 	rr=1
 	ri=1

From b7f71f188edecf9e4828ad612c4e5b02715d69cd Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:13:03 +0900
Subject: [PATCH 2/6] add: RESTRICT_HOSTNAME_PATTERN config

---
 compose-cd | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compose-cd b/compose-cd
index 2f2b887..fc122ff 100755
--- a/compose-cd
+++ b/compose-cd
@@ -129,6 +129,13 @@ function load_config() {
 
 	if [ -z ${RESTART_WITH_BUILD+x} ]; then RESTART_WITH_BUILD=false; fi
 
+	if [ -z ${RESTRICT_HOSTNAME_PATTERN+x} ]; then
+		if ! expr match "$(hostname)" "${RESTRICT_HOSTNAME_PATTERN}" > /dev/null; then
+			# restricted but not match
+			ret=1   # skip update
+		fi
+	fi
+
 	if "$UPDATE_REPO_ONLY" && "$UPDATE_IMAGE_ONLY"; then
 		compose_log echo "UPDATE_REPO_ONLY and UPDATE_IMAGE_ONLY are true. This is something wrong."
 		exit 1

From 92999d3c4d4cc1ff68485e267e547b57a33326aa Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:15:31 +0900
Subject: [PATCH 3/6] shfmt: redirect

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 compose-cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose-cd b/compose-cd
index fc122ff..7f1e2a5 100755
--- a/compose-cd
+++ b/compose-cd
@@ -130,7 +130,7 @@ function load_config() {
 	if [ -z ${RESTART_WITH_BUILD+x} ]; then RESTART_WITH_BUILD=false; fi
 
 	if [ -z ${RESTRICT_HOSTNAME_PATTERN+x} ]; then
-		if ! expr match "$(hostname)" "${RESTRICT_HOSTNAME_PATTERN}" > /dev/null; then
+		if ! expr match "$(hostname)" "${RESTRICT_HOSTNAME_PATTERN}" >/dev/null; then
 			# restricted but not match
 			ret=1   # skip update
 		fi

From 0a485311749db26b08acc4883a69b74794e1dc42 Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:16:23 +0900
Subject: [PATCH 4/6] shfmt: comment indent

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 compose-cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose-cd b/compose-cd
index 7f1e2a5..cb98cd9 100755
--- a/compose-cd
+++ b/compose-cd
@@ -132,7 +132,7 @@ function load_config() {
 	if [ -z ${RESTRICT_HOSTNAME_PATTERN+x} ]; then
 		if ! expr match "$(hostname)" "${RESTRICT_HOSTNAME_PATTERN}" >/dev/null; then
 			# restricted but not match
-			ret=1   # skip update
+			ret=1 # skip update
 		fi
 	fi
 

From 6e6144caca07e3a09c07571d02f0aa13ed4c287b Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:22:44 +0900
Subject: [PATCH 5/6] shellcheck: fix expr match

---
 compose-cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose-cd b/compose-cd
index cb98cd9..7b1f53b 100755
--- a/compose-cd
+++ b/compose-cd
@@ -130,7 +130,7 @@ function load_config() {
 	if [ -z ${RESTART_WITH_BUILD+x} ]; then RESTART_WITH_BUILD=false; fi
 
 	if [ -z ${RESTRICT_HOSTNAME_PATTERN+x} ]; then
-		if ! expr match "$(hostname)" "${RESTRICT_HOSTNAME_PATTERN}" >/dev/null; then
+		if ! expr "$(hostname)" : "${RESTRICT_HOSTNAME_PATTERN}" >/dev/null; then
 			# restricted but not match
 			ret=1 # skip update
 		fi

From 4992c080e30811f72e5c233005f1ee81e6d22e0c Mon Sep 17 00:00:00 2001
From: sksat <sksat@sksat.net>
Date: Sun, 31 Jul 2022 22:29:41 +0900
Subject: [PATCH 6/6] fix: if

---
 compose-cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose-cd b/compose-cd
index 7b1f53b..74d58c2 100755
--- a/compose-cd
+++ b/compose-cd
@@ -129,7 +129,7 @@ function load_config() {
 
 	if [ -z ${RESTART_WITH_BUILD+x} ]; then RESTART_WITH_BUILD=false; fi
 
-	if [ -z ${RESTRICT_HOSTNAME_PATTERN+x} ]; then
+	if [ -v RESTRICT_HOSTNAME_PATTERN ]; then
 		if ! expr "$(hostname)" : "${RESTRICT_HOSTNAME_PATTERN}" >/dev/null; then
 			# restricted but not match
 			ret=1 # skip update