GerhardHoffmann/customer_281
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-07-04 12:14:20 +02:00
commit 1071e8e762
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.githooks/post-merge
View File

@ -11,8 +11,10 @@ if [ -z $IFS ]; then
IFS=$'\n' IFS=$'\n'
fi fi
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
#TODO: use in UpdateController #TODO: use in UpdateController
get_blob () { # get the blob of the file(name) passed as $1 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") grep -q $1 && echo -n {} && head -n 1")
} }
write_log_file () { write_log_file () {
local now=$(date +"%Y-%m-%dT%T") local now=$(date +"%Y-%m-%dT%T")
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

BIN
etc/dc/dc2c.4.11.bin Executable file
View File

Binary file not shown.

BIN
etc/dc/dc2c.4.33.bin Executable file
View File

Binary file not shown.

2
etc/dc/dc2c.bin
View File

@ -1 +1 @@
dc2c.4.35.bin dc2c.4.33.bin

4
etc/psa_config/DC2C_print10.json
View File

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

8
etc/psa_update/opkg_commands
View File

@ -6,9 +6,9 @@
# opkg prefix will be added inside evaluating script # opkg prefix will be added inside evaluating script
# #
# 2023-06-30: return to usual workflow # 2023-06-30: return to usual workflow
opkg info ptu5-gitinstaller #opkg info ptu5-gitinstaller
opkg info atbqt opkg info atbqt
opkg update #opkg update
opkg install ptu5-gitinstaller #opkg install ptu5-gitinstaller
opkg install atbqt #opkg install atbqt
opkg info atbqt opkg info atbqt