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

json/ini extended to json/ini/hex

Browse Source
This commit is contained in:
Gerhard Hoffmann 2022-06-02 21:53:33 +02:00
parent 1ad3b7e68f
commit 262a851045
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
update_psa_impl
View File

@ -86,20 +86,20 @@ update_psa() {
# dateinen zu ueberpruefen # dateinen zu ueberpruefen
local changed_files=$(changed_file_names) local changed_files=$(changed_file_names)
local json_ini_files=$(filter_json_ini_files "$changed_files") local files_to_copy=$(filter_changed_files "$changed_files" 'json|ini|hex')
update_psa_report_changed_file_names $changed_files # message to ISMAS update_psa_report_changed_file_names $changed_files # message to ISMAS
# check if *.conf and/or *.ini-files have to md5-sum as denoted # check if *.conf and/or *.ini-files have to md5-sum as denoted
# in update.conf # in update.conf
if ! check_md5_for_changed_json_and_ini_files "$json_ini_files" ; then if ! check_md5_for_changed_json_and_ini_files "$files_to_copy" ; then
local __r=$? local __r=$?
log_error "$func:${LINENO}: new customer files wrong" log_error "$func:${LINENO}: new customer files wrong"
revert_customer_repository revert_customer_repository
exit $__r exit $__r
fi fi
if ! check_hardware_compatibility "$json_ini_files" ; then if ! check_hardware_compatibility "$files_to_copy" ; then
local __r=$? local __r=$?
log_error "$func:${LINENO}: json/ini-files not fit for PSA" log_error "$func:${LINENO}: json/ini-files not fit for PSA"
revert_customer_repository revert_customer_repository
@ -107,7 +107,7 @@ update_psa() {
fi fi
# copy *.conf and/or *.ini-files to their corresponding system-directories # copy *.conf and/or *.ini-files to their corresponding system-directories
if ! copy $json_ini_files; then if ! copy $files_to_copy; then
local __r=$? local __r=$?
log_error "$func:${LINENO}: copy operation failed" log_error "$func:${LINENO}: copy operation failed"
revert_customer_repository revert_customer_repository
@ -167,20 +167,9 @@ update_psa() {
log_error "$func:${LINENO}: cleanup_previous_version failed" log_error "$func:${LINENO}: cleanup_previous_version failed"
fi fi
# TODO: nach (erfolgreichem) abschluss sollte man immer das aktuelle setting
# ans ISMAS schicken. ISMAS sollte immer wissen, was gerade auf dem
# Automaten steht.
update_psa_cleanup $UPDATE_ISMAS_PROGRESS \ update_psa_cleanup $UPDATE_ISMAS_PROGRESS \
$RC_SUCCESS "cleanup after psa update" $RC_SUCCESS "cleanup after psa update"
update_psa_update_succeeded $UPDATE_SUCCEEDED \
$RC_SUCCESS "psa update succeeded"
update_psa_update_succeeded $UPDATE_ACTIVATED \
$RC_SUCCESS "psa update activated"
log_info "$func:${LINENO}: success"
exit 0 exit 0
} }