testing

.githooks/post-merge

@@ -15,7 +15,7 @@ GIT_PULL_TMP=/tmp/git_pull
 OPKG_CMDS_TMP=/tmp/opkg_commands
 
 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
+    if grep -E -q "(DC.*json|dc2c.hex|tariff.*json)" <<< $fn; then
         echo "$fn" >> $GIT_PULL_TMP
     fi
     if grep -E -q ".*opkg_commands" <<< $fn; then
@@ -29,3 +29,4 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
         source "$fn"
     fi
 done
+

etc/psa_config/DC2C_print30.json

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

etc/psa_config/DC2C_print31.json

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

etc/psa_config/DC2C_print32.json

@@ -2,5 +2,5 @@
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
 "":"",
-"":"iiii"
+"":"6666"
 }

opt/ptu5/opt/customer_szeged_281/etc/psa_config/DC2C_print32.json

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