diff --git a/.githooks/post-merge b/.githooks/post-merge index 7175428..fd0f5fe 100755 --- a/.githooks/post-merge +++ b/.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 diff --git a/etc/dc/dc2c.4.11.bin b/etc/dc/dc2c.4.11.bin new file mode 100755 index 0000000..3f5fffb Binary files /dev/null and b/etc/dc/dc2c.4.11.bin differ diff --git a/etc/dc/dc2c.4.33.bin b/etc/dc/dc2c.4.33.bin new file mode 100755 index 0000000..2b86ef5 Binary files /dev/null and b/etc/dc/dc2c.4.33.bin differ diff --git a/etc/dc/dc2c.bin b/etc/dc/dc2c.bin index 6012a81..4fe4ead 120000 --- a/etc/dc/dc2c.bin +++ b/etc/dc/dc2c.bin @@ -1 +1 @@ -dc2c.4.35.bin \ No newline at end of file +dc2c.4.33.bin \ No newline at end of file diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index db493d0..a6e6c16 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +"test":"" +} diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index aa2b947..c5c87f4 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -6,9 +6,9 @@ # opkg prefix will be added inside evaluating script # # 2023-06-30: return to usual workflow -opkg info ptu5-gitinstaller +#opkg info ptu5-gitinstaller opkg info atbqt -opkg update -opkg install ptu5-gitinstaller -opkg install atbqt +#opkg update +#opkg install ptu5-gitinstaller +#opkg install atbqt opkg info atbqt