Revert to original versions

tarif 04/06 -> exact price: 163

.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

.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