From 17222ae1aee02eb23d6ce8e0241269701059a549 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Mon, 13 Mar 2023 14:39:30 +0100
Subject: [PATCH] Fix: Work around bash ignoring errors in function

when function itself has error checking

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 docker-entrypoint.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0a59549..370de8b 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -70,22 +70,22 @@ function run_restore() {
   fi
 
   info "Initializing empty git repository..."
-  git init -b ${BRANCH}
+  git init -b ${BRANCH} || fatal "Initializing repo failed (exit $?)"
 
   info "Setting up remote..."
-  git remote add origin "${REMOTE}"
+  git remote add origin "${REMOTE}" || fatal "Adding remote failed (exit $?)"
 
   info "Fetching remote to reset..."
-  git fetch origin ${BRANCH} || {
-    error "Fetch failed (exit $?)"
-    return 1
-  }
+  git fetch origin ${BRANCH} || fatal "Fetch failed (exit $?)"
 
   info "Resetting to remote state..."
-  git reset --hard FETCH_HEAD
-  git branch -u origin/"${BRANCH}" "${BRANCH}"
+  git reset --hard FETCH_HEAD || fatal "Resetting onto FETCH_HEAD failed (exit $?)"
+  git branch -u origin/"${BRANCH}" "${BRANCH}" || fatal "Configuring upstream branch failed (exit $?)"
 
-  [[ -z $CHOWN_UID ]] || chown -R ${CHOWN_UID}:${CHOWN_GID} .
+  [[ -z $CHOWN_UID ]] || {
+    info "Chown-ing files to ${CHOWN_UID}:${CHOWN_GID}..."
+    chown -R ${CHOWN_UID}:${CHOWN_GID} . || fatal "Chown failed (exit $?)"
+  }
 }
 
 function run_sync() {