16 Commits

Author SHA1 Message Date
7a790e442f Write $line to checkout_history-file only once 2023-06-20 16:06:33 +02:00
68d5205530 re-test post-merge-hook 2023-06-20 15:26:38 +02:00
d1cffff1ba test for post-merge-hook 2023-06-20 12:36:01 +02:00
7c77f1fe11 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 17:10:36 +02:00
2b10e4df93 add new opkg commands: install atbqt, atb-plugin-cc-iself, atb-plugin-dc, libdevicecontroller 2023-06-19 17:10:28 +02:00
9528fa5ffc Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 10:38:53 +02:00
1780e75ac9 testing 16:03 2023-06-05 16:03:41 +02:00
d71556abba testing 16:00 2023-06-05 16:00:49 +02:00
e6342a1e8f check for existence of opkg_commands-file (2) 2023-06-05 15:58:01 +02:00
72e9e645a1 check for existence of opkg_commands-file 2023-06-05 15:51:30 +02:00
530327e20d testing 15:39 2023-06-05 15:39:28 +02:00
0a3bfde486 testing 15:26 2023-06-05 15:26:16 +02:00
94bde10396 testing 15:22 2023-06-05 15:23:07 +02:00
b66848bb75 use the link dc2c.bin and do not add timestamp into file 2023-06-05 15:20:18 +02:00
42317e7660 testing 15:11 2023-06-05 15:11:49 +02:00
605461897e testing new update_psa 2023-06-05 13:59:25 +02:00
3 changed files with 27 additions and 22 deletions

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
echo "$line" >> $CHECKOUT_HISTORY_FILE
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 @$now" >> $CHECKOUT_HISTORY_FILE
else else
echo "*******************************************************" echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "

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"
} }

View File

@@ -3,9 +3,9 @@
# package manipulation commands without package: # package manipulation commands without package:
# update, upgrade, clean # update, upgrade, clean
# #
#
# informational commands without package: # informational commands without package:
# list, list-installed, list-upgradable # list, list-installed, list-upgradable
#
# ptu5-atb-apinfo # ptu5-atb-apinfo
# ptu5-scripts # ptu5-scripts
# ptu5-atb-apinfo # ptu5-atb-apinfo
@@ -15,11 +15,13 @@
# list-installed # list-installed
# --force-reinstall install ptu5-atb-apinfo # --force-reinstall install ptu5-atb-apinfo
# --force-reinstall install atbqt # --force-reinstall install atbqt
# update # opkg update
# opkg install atbqt // die PTU-Kundenapplikation
# opkg install atb-plugin-cc-iself // das Ingenico-iSelf plugin
# opkg install atb-plugin-dc // das DeviceController plugin für ATBQT
# opkg install libdevicecontroller // libCAmaster.so
opkg update opkg update
# opkg --noaction install atbqt opkg install atbqt
# opkg install atbqt opkg install atb-plugin-cc-iself
# opkg install atb-plugin-dc
# opkg install libdevicecontroller
#