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

Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1

Browse Source
This commit is contained in:
Siegfried Siegert
2023-06-19 10:38:53 +02:00
parent ad987e5be6 1780e75ac9
commit 9528fa5ffc
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.githooks/post-checkout
View File

@@ -19,29 +19,32 @@ write_log_file () {
if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then
# line not found. first checkout of this branch (on this PSA). # line not found. first checkout of this branch (on this PSA).
# mark dc and print-templates to be downloaded by update-tool. # mark dc and print-templates to be downloaded by update-tool.
echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG echo "DOWNLOAD, /etc/dc/dc2c.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_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_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_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_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 -qE . "${OPKG_COMMANDS_FILE}"; then if [ -f "$OPKG_COMMANDS_FILE" ]; then
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) if grep -qE . "${OPKG_COMMANDS_FILE}"; then
for opkg_c in "${opkg_commands[@]}"; do readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
# check for lines longer than 'opkg ' for opkg_c in "${opkg_commands[@]}"; do
if [ "${#opkg_c}" -gt 4 ]; then # check for lines longer than 'opkg '
# comment: spaces, at least one '#' if [ "${#opkg_c}" -gt 4 ]; then
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue # comment: spaces, at least one '#'
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1 grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo "" >> $GIT_UPDATE_LOG 2>&1 echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
fi echo "" >> $GIT_UPDATE_LOG 2>&1
done fi
done
fi
fi fi
else else
echo "Found existing line: $line. Do nothing" echo "Found existing line: $line. Do nothing"
fi fi
echo "$line @$now" >> $CHECKOUT_HISTORY_FILE echo "$line" >> $CHECKOUT_HISTORY_FILE
# echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
else else
echo "*******************************************************" echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "

2
etc/psa_config/DC2C_print10.json
View File

@@ -1,5 +1,5 @@
{ {
"title":"DC2C_pri10", "title":"DC2C_pri10",
"version":"27.02.2023 12:20 00001", "version":"27.02.2023 12:20 00001",
"test":"" "test":"05062023-16:03"
} }