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

Compare commits

base: GerhardHoffmann:7a35039dad57e297a8245667da5137b5b804b17b
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:szeged_preview_20230607
GerhardHoffmann:szeged_preview_20230609
..
compare: GerhardHoffmann:7c2d78e6db9a2b09d9b94052c42b32ca390e8349
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:szeged_preview_20230607
GerhardHoffmann:szeged_preview_20230609

No commits in common. "7a35039dad57e297a8245667da5137b5b804b17b" and "7c2d78e6db9a2b09d9b94052c42b32ca390e8349" have entirely different histories.
7a35039dad ... 7c2d78e6db

3 changed files with 13 additions and 19 deletions
Show Stats Expand all files Collapse all files

12
general_utils
View File

@ -85,24 +85,21 @@ if [ "${general_utils_sourced:-1}" = "1" ]; then # include only once
# if [ -z ${!1} ]; then # if [ -z ${!1} ]; then
# log_fatal "$1 not set" # log_fatal "$1 not set"
# fi # fi
# log_debug "$1=${!1}" log_debug "$1=${!1}"
:
} }
assert_d () { assert_d () {
# if [ ! -d ${!1} ]; then # if [ ! -d ${!1} ]; then
# log_fatal "$1 does not exist" # log_fatal "$1 does not exist"
# fi # fi
# log_debug "$1=${!1}" log_debug "$1=${!1}"
:
} }
assert_f () { assert_f () {
# if [ ! -f ${!1} ]; then # if [ ! -f ${!1} ]; then
# log_fatal "$1 does not exist" # log_fatal "$1 does not exist"
# fi # fi
#log_debug "$1=${!1}" log_debug "$1=${!1}"
:
} }
assert_a () { assert_a () {
@ -112,7 +109,6 @@ if [ "${general_utils_sourced:-1}" = "1" ]; then # include only once
# if [ $__len -eq 0 ]; then # if [ $__len -eq 0 ]; then
# log_fatal "$1 not set" # log_fatal "$1 not set"
# fi # fi
# log_debug "$1=$__n" log_debug "$1=$__n"
:
} }
fi fi

10
read_config
View File

@ -379,11 +379,11 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
${DC_PSA_DC_FILE##*${CUSTOMER_ID}/} \ ${DC_PSA_DC_FILE##*${CUSTOMER_ID}/} \
${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/}) ${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/})
# log_debug "known json/ini/hex_files ->" log_debug "known json/ini/hex_files ->"
# for (( i=0; i < ${#KNOWN_FILES[@]}; ++i )); do for (( i=0; i < ${#KNOWN_FILES[@]}; ++i )); do
# tab=$'\t' tab=$'\t'
# log_debug "$tab$tab ${KNOWN_FILES[$i]}" log_debug "$tab$tab ${KNOWN_FILES[$i]}"
# done done
log_debug "sanity of ${CUSTOMER_REPOSITORY_PATH} OK" log_debug "sanity of ${CUSTOMER_REPOSITORY_PATH} OK"
# compute version string for current (i.e. previous) version # compute version string for current (i.e. previous) version

10
update_psa_impl
View File

@ -28,13 +28,11 @@ collect_current_configuration () {
#done #done
} }
update_psa() { # calling with a parameter is used for testing update_psa() {
if [ $# -eq 0 ]; then if ! updates_available; then # check for false alarm
if ! updates_available; then # check for false alarm update_psa_false_alarm "update requested, but no WAIT state detected"
update_psa_false_alarm "update requested, but no WAIT state detected" exit $?
exit $EXITCODE
fi
fi fi
update_psa_activated # message to ISMAS update_psa_activated # message to ISMAS