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

.githooks/post-checkout

@@ -1,12 +1,12 @@
 #!/bin/bash -
-# echo "POST-CHECKOUT"
+# echo "POST-CHECKOUT $PWD" > "/tmp/post_checkout.txt"
 # echo "PREV-HEAD=$1"
 # echo "CURR-HEAD=$2"
 # echo "BRANCH-CHECKOUT=$3"
 
 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"
+readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
             
 write_log_file () {
     if [ -f $CHECKOUT_HISTORY_FILE ]; then
@@ -19,13 +19,33 @@ write_log_file () {
         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 "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_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_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_print20.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_device.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
+            echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
+            if [ -f "$OPKG_COMMANDS_FILE" ]; then
                 if grep -qE . "${OPKG_COMMANDS_FILE}"; then
                     readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
                     for opkg_c in "${opkg_commands[@]}"; do
@@ -38,10 +58,12 @@ write_log_file () {
                         fi
                     done
                 fi
+            fi
+            echo "$line" >> $CHECKOUT_HISTORY_FILE
         else
             echo "Found existing line: $line. Do nothing"
         fi
-        echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
+        # echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
     else
         echo "*******************************************************"
         echo "     $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!!         "

.githooks/post-merge

@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
+
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 
+
 #TODO: use in UpdateController
 
 get_blob () {   # get the blob of the file(name) passed as $1
@@ -27,6 +29,7 @@ get_commit_for_blob () {
            grep -q $1 && echo -n {} && head -n 1")
 }
 
+
 write_log_file () {
     local now=$(date +"%Y-%m-%dT%T")
     for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do

etc/dc/dc2c.bin

@@ -1 +1 @@
-dc2c.4.22.bin
+dc2c.4.33.bin

etc/psa_tariff/tariff04.json

@@ -38,7 +38,7 @@
       "pop_max_time": 600,
       "pop_min_price": 0,
       "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_daily_card_price": 2400
     }
   ],
   "PaymentRate": [

etc/psa_update/opkg_commands

@@ -1,25 +1,14 @@
+###############################################################################
+#                          !!! NOTE !!!
+###############################################################################
+# opkg-commands added to this file will be executed by ATBUpdateTool.          
+###############################################################################
 # opkg prefix will be added inside evaluating script
 #
-# package manipulation commands without package:
+# 2023-06-30: return to usual workflow
-# update, upgrade, clean
+#opkg info ptu5-gitinstaller
-#
+opkg info atbqt
-# informational commands without package:
+#opkg update
-# list, list-installed, list-upgradable
+#opkg install ptu5-gitinstaller
-#
+#opkg install atbqt
-# ptu5-atb-apinfo
+opkg info atbqt
-# ptu5-scripts
-# ptu5-atb-apinfo
-# atb-plugin-calculateprice-prm
-# atb-plugin-cc-tcpzvt
-# atbqt
-# list-installed
-# --force-reinstall install ptu5-atb-apinfo
-# --force-reinstall install atbqt
-# update
-opkg update
-# opkg --noaction install atbqt
-# opkg install atbqt
-#
-#
-#
-