Compare commits
4 Commits
7c2d78e6db
...
szeged_pre
Author | SHA1 | Date | |
---|---|---|---|
c229f7072c | |||
7a35039dad | |||
42fb74a041 | |||
d69f767002 |
@@ -85,21 +85,24 @@ 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 () {
|
||||||
@@ -109,6 +112,7 @@ 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
10
read_config
@@ -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
|
||||||
|
@@ -75,6 +75,7 @@ if cd "$WORKING_DIRECTORY"; then
|
|||||||
# updates_available && break
|
# updates_available && break
|
||||||
#done
|
#done
|
||||||
|
|
||||||
|
# update_psa "testing"
|
||||||
update_psa
|
update_psa
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -28,11 +28,13 @@ collect_current_configuration () {
|
|||||||
#done
|
#done
|
||||||
}
|
}
|
||||||
|
|
||||||
update_psa() {
|
update_psa() { # calling with a parameter is used for testing
|
||||||
|
|
||||||
if ! updates_available; then # check for false alarm
|
if [ $# -eq 0 ]; then
|
||||||
update_psa_false_alarm "update requested, but no WAIT state detected"
|
if ! updates_available; then # check for false alarm
|
||||||
exit $?
|
update_psa_false_alarm "update requested, but no WAIT state detected"
|
||||||
|
exit $EXITCODE
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
update_psa_activated # message to ISMAS
|
update_psa_activated # message to ISMAS
|
||||||
|
Reference in New Issue
Block a user