GerhardHoffmann/customer_281
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-05-26 08:16:24 +02:00
parent 6e7501e54c
commit 0e8aa33feb
2 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.githooks/post-checkout
View File

@ -8,7 +8,8 @@ readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history"
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv" readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands" readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands"
if [ -f $CHECKOUT_HISTORY_FILE ]; then write_log_file () {
if [ -f $CHECKOUT_HISTORY_FILE ]; then
# repo: customer_281 # repo: customer_281
readonly repo=$(basename $(git rev-parse --show-toplevel)) readonly repo=$(basename $(git rev-parse --show-toplevel))
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
@ -26,15 +27,13 @@ if [ -f $CHECKOUT_HISTORY_FILE ]; then
echo "DOWNLOAD, /etc/psa_config/DC2C_print04.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_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print32.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 if grep -qE . "${OPKG_COMMANDS_FILE}"; then
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg ' # check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#' # comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue 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 -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1 echo "" >> $GIT_UPDATE_LOG 2>&1
fi fi
@ -43,8 +42,12 @@ if [ -f $CHECKOUT_HISTORY_FILE ]; then
else else
echo "Found existing line: $line. Do nothing" echo "Found existing line: $line. Do nothing"
fi fi
else else
echo "*******************************************************" echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "
echo "*******************************************************" echo "*******************************************************"
fi fi
}
write_log_file

25
.githooks/post-merge
View File

@ -28,29 +28,24 @@ get_commit_for_blob () {
} }
write_log_file () { 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 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 # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
# add '/' prefix # add '/' prefix
fn=$(echo $fn | awk '{ printf "/"$0 }') echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
# 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 fi
if grep -E -q ".*opkg_commands" <<< $fn; then if grep -qE ".*opkg_commands" <<< $fn; then
readarray opkg_commands < <(cat $fn) readarray opkg_commands < <(cat $fn)
for opkg_c in "${opkg_commands[@]}"; do for opkg_c in "${opkg_commands[@]}"; do
test -z $opkg_c && continue; # check for lines longer than 'opkg '
test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue if [ "${#opkg_c}" -gt 4 ]; then
echo -n "EXECUTE, $opkg_c, $__date, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1 # 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 echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done done
# source "$fn"
fi fi
done done
} }