Adding get_blob, get_commit_for_blob, changed_file_names.

.githooks/post-checkout

@@ -0,0 +1 @@
+echo "POST-CHECKOUT"

.githooks/post-merge

@@ -11,7 +11,7 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
-GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
+GIT_PULL_TMP=/tmp/git_pull
 OPKG_CMDS_TMP=/tmp/opkg_commands
 
 rm -f $GIT_PULL_TMP
@@ -23,23 +23,28 @@ get_blob () {   # get the blob of the file(name) passed as $1
 }
 
 get_commit_for_blob () {
+    blob=$(get_blob $1)
+    if [ ! -z $blob ]; then
         # search for the blob in all commits for the file(name) $1
-    echo $(git log --all --pretty=format:%H -- $2   |
-           xargs -I{} bash -c "git ls-tree {} -- $2 |
-           grep -q $1 && echo -n {} && head -n 1")
+        echo $(echo $(git log --all --pretty=format:%H -- $1) |
+               xargs -I{} bash -c "git ls-tree {} -- $1       |
+               grep -q $blob && echo {}")
+    fi
+}
+
+changed_file_names () {
+    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+        CHANGED_FILE_NAMES+=($fn)
+    done
 }
 
 for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
     if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
-        # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
-        # add '/' prefix
-        fn=$(echo $fn | awk '{ printf "/"$0 }')
+        fsize=0
         if [[ -f "$fn" ]]; then
-            blob=$(get_blob "$fn")
-            commit=$(get_commit_for_blob $blob "$fn")
             fsize=$(ls -l "$fn" | awk '{ print $5 }')
-            echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
         fi
+        echo "$fn $fsize" >> $GIT_PULL_TMP
     fi
     if grep -E -q ".*opkg_commands" <<< $fn; then
         readarray opkg_commands < <(cat $fn)

.gitignore

@@ -1,16 +1,27 @@
+# First, ignore everything
 *
-
-## Except
+# Now, whitelist anything that's a directory
+!*/
+# And all the file types you're interested in
+!.gitignore
+!.githooks/post-merge
+!.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
-!/etc/*.ini
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/dc2c.hex
+!**/.githooks/post-checkout
 
-!/opt/app/ATBAPP/*.ini
-!/opt/app/sysconfig/*.ini
-!/opt/app/ISMASMgr/*.ini
+## Except
+!etc/atb/*
+!etc/psa_config/*
+!etc/psa_update/*
+!etc/psa_tariff/*
+!etc/dc/*.hex
+!etc/dc/*.bin
+!*/etc/*.ini
+!*/etc/atb/*
+!*/etc/psa_config/*
+!*/etc/psa_update/*
+!*/etc/psa_tariff/*
+!*/etc/dc/*.hex
+!*/etc/dc/*.bin
 

etc/atb/ATBAPP.ini

@@ -24,7 +24,7 @@ useVehicle=240
 #useProduct=[128+][64+][32+][16+][8]
 useProduct=240
 
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+textfile=/opt/app/ATBQT/text/HMI_Texte.xml
 logfile=/var/log/atbqt.log
 alternativeLogoFile=
 
@@ -54,7 +54,6 @@ showInfoButton=false
 showHelpButton=false
 
 useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
 
 [SCREENCONFIG]
 sc_31="1,1,0"
@@ -71,7 +70,6 @@ sc_53="1,0,0"
 [PLUGINS]
 CCPlugin=IngenicoISelf_CCPlugin
 CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
 
 
 [IngenicoISelf_CCPlugin]
@@ -96,5 +94,4 @@ paymentPointInTime=poa
 [MOBILISIS_CalculatePricePlugin]
 useDebug=1
 
-[ATBDeviceControllerPlugin]
-serialPort=ttymxc2
+

etc/atb/SystemControl.ini

@@ -46,6 +46,5 @@ networkRestart="/sbin/ifup -a"
 size=1
 1\id=PTU5UPDATE
 1\program="/opt/app/tools/atbupdate/PTUGitInstaller"
-1\arguments=-q,--platform,wayland
-1\envs=QT_QPA_EGLFS_KMS_ATOMIC=1,QT_QPA_EGLFS_ALWAYS_SET_MODE=1,XDG_RUNTIME_DIR=/var/run/user/0
+1\arguments="-q,--platform,wayland"
 1\hourOfDay=1

etc/psa_config/DC2C_print32.json

@@ -2,5 +2,5 @@
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
 "":"",
-"":"10001"
+"":"8:50 3.April"
 }