From 26b2fad1e6341a6ae6e1adc8fa0cf177f4804417 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Sun, 5 Jun 2022 07:28:14 +0200
Subject: [PATCH] sourced log_helpers.sh

---
 git_helpers.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/git_helpers.sh b/git_helpers.sh
index cd7d901..0608796 100755
--- a/git_helpers.sh
+++ b/git_helpers.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # set -x 
 
+source ./log_helpers.sh
+
 GIT_SSL_NO_VERIFY=true
 
 commit_before_pull=""
@@ -36,6 +38,7 @@ revert_to_commit_before_pull () {
 # clone the customer repository in ./UpdateController/workspace.
 # this is done only once.
 clone_customer_repository () {
+    local func="${FUNCNAME[0]}"
     current_dir=${PWD##*/}
     current_dir="./${current_dir:-/}"
     if [ "$current_dir" = "./UpdateController" ]; then
@@ -45,29 +48,46 @@ clone_customer_repository () {
         # check if the directory is empty. If so, clone the
         # customer repository
         if ! find ./workspace -mindepth 1 -maxdepth 1 | read; then
-            echo "cloning ${1} ..."
+            log_debug "$func: cloning ${1} ..."
             ( cd ./workspace && git clone "$1" ; )
+            if [ $? -eq 0 ]; then
+                log_debug "$func: cloning ${1} done"
+                return 0
+            fi
         fi
     fi
+    return 1
 }
 # clone_customer_repository https://git.mimbach49.de/GerhardHoffmann/customer_281.git
 
 pull_customer_repository () {
     # has to be called in ./UpdateController
+    local func="${FUNCNAME[0]}"
     current_dir=${PWD##*/}
     current_dir="./${current_dir:-/}"
     if [ "$current_dir" = "./UpdateController" ]; then
         repository_dir="./workspace/$1"
         if ! [[ -d "$repository_dir" ]]; then
-            printf "%s\n" "$repository_dir does not exist!" >&2
+            log_crit "$func: $repository_dir does not exist!"
             return 1
         fi
-        if [ "$(cd $repository_dir && git pull)" = "Already up to date." ]; then
-            printf "%s\n" "$repository_dir already up to date." >&2
+        message=$(cd $repository_dir && git pull)
+        if [ "$message" = "Already up to date." ]; then
+            log_warn "$func: $repository_dir already up to date."
             return 1
         fi
+
+        log_info "$func: $message"
+
+        # Updating a6dd5d7..46d6b37
+
+        while IFS= read -r $line; do
+            echo "$line"
+# sed -E 's/(Updating\s+)([[:xdigit:]]+)(..)([[:xdigit:]]+).*?/\2 \4/'
+
+        done < <(printf "%s\n" "$message")
     else
-        printf "%s\n" "${FUNCNAME[0]} not called in ./UpdateController" >&2
+        log_crit "$func not called in ./UpdateController"
         return 1
     fi