testing

.githooks/post-merge

@@ -14,11 +14,8 @@ 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)" <<< $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
@@ -33,4 +30,3 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
     fi
 done
 
-

.gitignore

@@ -2,7 +2,7 @@
 
 ## Except
 !**/.gitignore
-!**/.git/hooks/post-merge
+!**/.git/hooks/*
 !/etc/*.ini
 !/etc/atb/*.ini
 !/etc/psa_config/*
@@ -14,5 +14,5 @@
 !/opt/app/sysconfig/*.ini
 !/opt/app/ISMASMgr/*.ini
 
-!/tmp/test.txt
+!**/.githooks/post-merge
 

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",
-"":"iiii"
+"":"5555"
 }

etc/psa_config/DC2C_print32.json

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

home/root/szeged/UpdateController/workspace/customer_szeged_281/.gitignore

@@ -1,14 +0,0 @@
-*
-
-!**/.gitignore
-!/etc/*.ini
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/dc2c.hex
-
-!/opt/app/ATBAPP/*.ini
-!/opt/app/sysconfig/*.ini
-!/opt/app/ISMASMgr/*.ini
-

home/root/szeged/customer_szeged_281/.gitignore

@@ -1,15 +0,0 @@
-## Ignore everything
-*
-
-## Except
-!/etc/*.ini
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/*
-!/opt/app/ATBAPP/*.ini
-!/opt/app/ISMASMgr/*.ini
-!/opt/app/sysconfig/*.ini
-
-

opt/ptu5/opt/customer_szeged_281/.gitignore

@@ -1,18 +0,0 @@
-*
-
-## Except
-!**/.gitignore
-!**/.git/hooks/post-merge
-!/etc/*.ini
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/dc2c.hex
-
-!/opt/app/ATBAPP/*.ini
-!/opt/app/sysconfig/*.ini
-!/opt/app/ISMASMgr/*.ini
-
-!/tmp/test.txt
-

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

tmp/customer_szeged_281/.gitignore

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

tmp/test.txt

@@ -1 +0,0 @@
-bbbb