From 13cfbb493228e39ec37b5cd863ff0ef14d31c147 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 24 May 2023 11:35:50 +0200
Subject: [PATCH] Use /opt/app/tools/atbupdate/update_log.csv as main-file for
 update-history.

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

diff --git a/.githooks/post-merge b/.githooks/post-merge
index 8793b5d..2c2a56f 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
@@ -30,25 +28,27 @@ get_commit_for_blob () {
 }
 
 for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+    local __date = $(date +"%Y-%m-%dT%T")
     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
-        fi
+        # 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
+        # fi
+        echo "DOWNLOAD, $fn, $__date, N/A" >> "$GIT_UPDATE_LOG"
     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
+            echo -n "EXECUTE, $opkg_c, $__date, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
+            echo "" >> $GIT_UPDATE_LOG 2>&1
         done
-        source "$fn"
+        # source "$fn"
     fi
 done