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