Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1

This commit is contained in:
Siegfried Siegert 2023-05-05 10:51:28 +02:00
commit f33d45d082
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
10 changed files with 108 additions and 39 deletions

4
.githooks/post-checkout Executable file
View File

@ -0,0 +1,4 @@
echo "POST-CHECKOUT"
echo "PREV-HEAD=$1"
echo "CURR-HEAD=$2"
echo "BRANCH-CHECKOUT=$3"

View File

@ -11,19 +11,35 @@ if [ -z $IFS ]; then
IFS=$'\n' IFS=$'\n'
fi fi
GIT_PULL_TMP=/tmp/git_pull GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
OPKG_CMDS_TMP=/tmp/opkg_commands OPKG_CMDS_TMP=/tmp/opkg_commands
rm -f $GIT_PULL_TMP rm -f $GIT_PULL_TMP
rm -f $OPKG_CMDS_TMP rm -f $OPKG_CMDS_TMP
get_blob () { # get the blob of the file(name) passed as $1
# note: this can be used for any file in the filesystem
echo $(git hash-object $1)
}
get_commit_for_blob () {
# 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")
}
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do 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 if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
fsize=0 # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
# add '/' prefix
fn=$(echo $fn | awk '{ printf "/"$0 }')
if [[ -f "$fn" ]]; then if [[ -f "$fn" ]]; then
blob=$(get_blob "$fn")
commit=$(get_commit_for_blob $blob "$fn")
fsize=$(ls -l "$fn" | awk '{ print $5 }') fsize=$(ls -l "$fn" | awk '{ print $5 }')
echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
fi fi
echo "$fn $fsize" >> $GIT_PULL_TMP
fi fi
if grep -E -q ".*opkg_commands" <<< $fn; then if grep -E -q ".*opkg_commands" <<< $fn; then
readarray opkg_commands < <(cat $fn) readarray opkg_commands < <(cat $fn)

2
.gitignore vendored
View File

@ -5,8 +5,10 @@
# And all the file types you're interested in # And all the file types you're interested in
!.gitignore !.gitignore
!.githooks/post-merge !.githooks/post-merge
!.githooks/post-checkout
!**/.gitignore !**/.gitignore
!**/.githooks/post-merge !**/.githooks/post-merge
!**/.githooks/post-checkout
## Except ## Except
!etc/atb/* !etc/atb/*

View File

@ -1,28 +1,36 @@
{ {
"title":"DC2C_pri01", "title":"DC2C_pri01",
"project":"DBM Szeged", "project":"DBM Szeged park_coins",
"version":"13.02.2023 12:20 00001", "issued":"13.04.2023 01.01",
"styl":"bold on", "styl":"size 01",
"text":"Parkingticket ", "text":"PARKOLÓJEGY",
"styl":"bold off", "styl":"size 11",
"feed":"nl", "feed":"nl",
"text":"Parkingticket ", "text":"Nyugta",
"styl":"under on", "styl":"size 00",
"text":"Parkingticket ",
"styl":"under off",
"feed":"nl", "feed":"nl",
"text":"Parkingticket ",
"styl":"latin on",
"text":"Parkingticket ",
"styl":"latin off",
"feed":"nl", "feed":"nl",
"text":"Parkingticket ", "text":"mögé jól láthatóan",
"styl":"font 09", "feed":"nl",
"text":"Park ", "text":"elhelyezni!",
"styl":"font 16", "feed":"nl",
"text":"Park ", "text":"A PARKOLÓ NEM ŐRZÖTT!",
"feed":"nl",
"styl":"size 10",
"text":"Rendszám: ",
"styl":"size 00",
"feed":"nl",
"vari":"Dynamic01",
"feed":"nl",
"text":"Parkolási idõ vége:",
"vari":"Dynamic02",
"vari":"Dynamic03",
"feed":"nl",
"text":"Parkolás helye:",
"vari":"location",
"text":"Összeg: ",
"vari":"Dynamic04",
"feed":"nl", "feed":"nl",
"":"" "":""
} }

View File

@ -1,5 +1,31 @@
{ {
"title":"DC2C_pri02", "title":"DC2C_pri02",
"version":"27.02.2023 12:20 00001", "project":"DBM Szeged park_coins",
"issued":"13.04.2023 01.01",
"text":"Kiadás időpontja:",
"vari":"date us",
"vari":"time long",
"text":"Automata száma: ",
"vari":"manu",
"feed":"nl",
"text":"Park.jegy sorsz.: ",
"vari":"TickCtr",
"feed":"nl",
"text":"Szegedi Közlekedési Kft",
"feed":"nl",
"text":"6720 Szeged ",
"feed":"nl",
"text":"Zrínyi utca 4-8",
"feed":"nl",
"text":"Adósz: 11092612-2-06",
"feed":"nl",
"text":"A jegy ára az ÁFA-t",
"feed":"nl",
"text":" tartalmazza!",
"feed":"nl",
"text":"Üf. szolg nyitvatartás:",
"feed":"nl",
"":"" "":""
} }

View File

@ -1,5 +1,21 @@
{ {
"title":"DC2C_pri03", "title":"DC2C_pri03",
"version":"27.02.2023 12:20 00001", "project":"DBM Szeged park_coins",
"issued":"13.04.2023 01.01",
"text":"H - P: 7:45 - 17:00",
"feed":"nl",
"text":"Tel: (80) 820-500",
"feed":"nl",
"text":"Parkoljon egy érintéssel. ",
"feed":"nl",
"text":"Használja bankkártyáját ",
"feed":"nl",
"text":" automatáinknál is!",
"feed":"nl",
"feed":"nl",
"feed":"nl",
"feed":"eject",i
"":"" "":""
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long