diff --git a/.githooks/post-merge b/.githooks/post-merge index b7acf13..7175428 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -30,12 +30,14 @@ get_commit_for_blob () { 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|dc2c.*bin)" <<< $fn; then + 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" - fi - if grep -qE ".*opkg_commands" <<< $fn; then + 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 '