From 0e8aa33febe0c1ae14eb9f25d8b2b486887a0ec6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 26 May 2023 08:16:24 +0200 Subject: [PATCH] testing --- .githooks/post-checkout | 77 +++++++++++++++++++++-------------------- .githooks/post-merge | 27 ++++++--------- 2 files changed, 51 insertions(+), 53 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index ad5e471..130fec3 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -8,43 +8,46 @@ readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history" readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv" readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands" -if [ -f $CHECKOUT_HISTORY_FILE ]; then - # repo: customer_281 - readonly repo=$(basename $(git rev-parse --show-toplevel)) - # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 - readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g) - readonly line="$repo:$branch" - readonly now="$(date +%Y-%m-%dT%T)" - if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then - # line not found. first checkout of this branch (on this PSA). - # mark dc and print-templates to be downloaded by update-tool. - echo $line >> $CHECKOUT_HISTORY_FILE - echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG - echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG - if grep -q . "${OPKG_COMMANDS_FILE}"; then - readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) - 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 "DDD=${#opkg_c}DDD" - 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 +write_log_file () { + if [ -f $CHECKOUT_HISTORY_FILE ]; then + # repo: customer_281 + readonly repo=$(basename $(git rev-parse --show-toplevel)) + # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 + readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g) + readonly line="$repo:$branch" + readonly now="$(date +%Y-%m-%dT%T)" + if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then + # line not found. first checkout of this branch (on this PSA). + # mark dc and print-templates to be downloaded by update-tool. + echo $line >> $CHECKOUT_HISTORY_FILE + echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG + if grep -qE . "${OPKG_COMMANDS_FILE}"; then + readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) + 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 + else + echo "Found existing line: $line. Do nothing" fi else - echo "Found existing line: $line. Do nothing" + echo "*******************************************************" + echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " + echo "*******************************************************" fi -else - echo "*******************************************************" - echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " - echo "*******************************************************" -fi +} + +write_log_file + diff --git a/.githooks/post-merge b/.githooks/post-merge index 30f5120..05326ec 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -28,29 +28,24 @@ get_commit_for_blob () { } write_log_file () { - local __date=$(date +"%Y-%m-%dT%T") + local now=$(date +"%Y-%m-%dT%T") 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 + if grep -qE "(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 - echo "DOWNLOAD, $fn, $__date, N/A" >> "$GIT_UPDATE_LOG" + echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG" fi - if grep -E -q ".*opkg_commands" <<< $fn; then + if grep -qE ".*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 "" >> $GIT_UPDATE_LOG 2>&1 + # 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 - # source "$fn" fi done }