test

Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_szeged_281

.githooks/post-merge

@@ -0,0 +1,34 @@
+#!/bin/bash -
+
+# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
+# commit=$(git rev-parse --verify HEAD)
+# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
+
+# Redirect output to stderr.
+exec 1>&2
+
+if [ -z $IFS ]; then
+    IFS=$'\n'
+fi
+
+GIT_PULL_TMP=/tmp/git_pull
+OPKG_CMDS_TMP=/tmp/opkg_commands
+
+rm -f $OPKG_PULL_TMP
+rm -f $OPKG_CMDS_TMP
+
+for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+    if grep -E -q ".*(DC*.json|dc/dc2c.hex|tariff*.json)" <<< $fn; then
+        echo "$fn" >> $GIT_PULL_TMP
+    fi
+    if grep -E -q ".*opkg_commands" <<< $fn; then
+        readarray opkg_commands < <(cat $fn)
+        for opkg_c in "${opkg_commands[@]}"; do
+            test -z $opkg_c && continue;
+            test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
+            echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
+            echo "" >> $OPKG_CMDS_TMP 2>&1
+        done
+        source "$fn"
+    fi
+done

.gitignore

@@ -1,15 +1,18 @@
-## Ignore everything
 *
 
 ## Except
+!**/.gitignore
+!**/.git/hooks
 !/etc/*.ini
 !/etc/atb/*.ini
 !/etc/psa_config/*
 !/etc/psa_update/*
 !/etc/psa_tariff/*
-!/etc/dc/*
+!/etc/dc/dc2c.hex
+
 !/opt/app/ATBAPP/*.ini
-!/opt/app/ISMASMgr/*.ini
 !/opt/app/sysconfig/*.ini
+!/opt/app/ISMASMgr/*.ini
 
+!**/.githooks/post-merge
 

etc/dc/dc2c.hex

@@ -6028,14 +6028,3 @@
 :10787400661F7A954BF286DE5F910895109639F073
 :10788400A89586E69EE00197F1F71197C9F7089548
 :00000001FF
-
-
-
-
-
-
-
-
-
-
-

etc/psa_config/DC2C_print31.json

@@ -1,5 +1,5 @@
 {
 "title":"DC2C_pri31",
 "version":"27.02.2023 12:20 00001",
-"":""
-}
+"":"ssss"
+}

etc/psa_config/DC2C_print32.json

@@ -1,5 +1,6 @@
 {
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
-"":""
+"":"",
+"":"iiii"
 }

etc/psa_tariff/tariff02.json

@@ -0,0 +1,4 @@
+{
+
+
+}

etc/psa_update/opkg_commands

@@ -0,0 +1,28 @@
+# opkg prefix will be added inside evaluating script
+#
+# package manipulation commands without package:
+# update, upgrade, clean
+#
+# informational commands without package:
+# list, list-installed, list-upgradable
+#
+# ptu5-atb-apinfo
+# 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
+
+
+#
+#
+#
+

opt/app/ATBAPP/ATBQT.ini

@@ -83,5 +83,5 @@ Currency=HUF
 [TCP_CONTROL]
 enable=1
 
-
+############
 

opt/app/ATBAPP/tariff.current

@@ -0,0 +1 @@
+"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"

opt/app/sysconfig/ISMASMgr.ini

@@ -3,10 +3,4 @@
     "xxx"   : "yyyy",
     "xxx"   : "yyyy",
     "xxx"   : "yyyy"
-
-
-
-
-
-
 }

opt/app/sysconfig/SystemControl.ini

@@ -0,0 +1 @@
+ffff