From 9519a6555e3264ca8b75b1d998a8961b08843cc3 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 27 Jun 2023 14:36:36 +0200
Subject: [PATCH] install same post-merge-hook as in branch zg1/zone1

---
 .githooks/post-merge | 54 +++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/.githooks/post-merge b/.githooks/post-merge
index 8793b5d..7175428 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,11 +11,9 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
-GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
-OPKG_CMDS_TMP=/tmp/opkg_commands
+GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 
-rm -f $GIT_PULL_TMP
-rm -f $OPKG_CMDS_TMP
+#TODO: use in UpdateController
 
 get_blob () {   # get the blob of the file(name) passed as $1
                 # note: this can be used for any file in the filesystem
@@ -29,26 +27,30 @@ get_commit_for_blob () {
            grep -q $1 && echo -n {} && head -n 1")
 }
 
-for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
-    if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
-        # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
-        # add '/' prefix
-        fn=$(echo $fn | awk '{ printf "/"$0 }')
-        if [[ -f "$fn" ]]; then
-            blob=$(get_blob "$fn")
-            commit=$(get_commit_for_blob $blob "$fn")
-            fsize=$(ls -l "$fn" | awk '{ print $5 }')
-            echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
+write_log_file () {
+    local now=$(date +"%Y-%m-%dT%T")
+    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+        if grep -qE "DC2C.*json" <<< $fn; then
+            # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
+            # add '/' prefix
+            echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
+        elif grep -qE "dc2c.bin" <<< $fn; then
+            # download the file referenced by the link dc2c.bin
+            echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
+        elif grep -qE ".*opkg_commands" <<< $fn; then
+            readarray opkg_commands < <(cat $fn)
+            for opkg_c in "${opkg_commands[@]}"; do
+                # check for lines longer than 'opkg '
+                if [ "${#opkg_c}" -gt 4 ]; then
+                    # comment: spaces, at least one '#'
+                    grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
+                    echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
+                    echo "" >> $GIT_UPDATE_LOG 2>&1
+                fi
+            done
         fi
-    fi
-    if grep -E -q ".*opkg_commands" <<< $fn; then
-        readarray opkg_commands < <(cat $fn)
-        for opkg_c in "${opkg_commands[@]}"; do
-            test -z $opkg_c && continue;
-            test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
-            echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
-            echo "" >> $OPKG_CMDS_TMP 2>&1
-        done
-        source "$fn"
-    fi
-done
+    done
+}
+
+write_log_file
+