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

Compare commits

base: GerhardHoffmann:ba1f70fec4719f028de76269901a08742ea31e9f
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:szeged_preview_20230607
GerhardHoffmann:szeged_preview_20230609
..
compare: GerhardHoffmann:e46f5962705ef5f8f6ae1f3b85e47fb2ced680d3
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:szeged_preview_20230607
GerhardHoffmann:szeged_preview_20230609

4 Commits
ba1f70fec4 ... e46f596270

Author SHA1 Message Date
Gerhard Hoffmann
e46f596270 shortened check_md5sum....() 2022-06-02 22:11:12 +02:00
Gerhard Hoffmann
c3def117a5 Added some variables for DC 2022-06-02 22:09:21 +02:00
Gerhard Hoffmann
fcef0f6ed6 ATBQT_ATB_PSA_BIN_FILE does not exist 2022-06-02 15:08:19 +02:00
Gerhard Hoffmann
729c0f8c18 add ATBQT_ATB_SYS_BIN_FILE 2022-06-02 15:05:34 +02:00
2 changed files with 106 additions and 78 deletions
Show Stats Expand all files Collapse all files

19
read_config
View File

@ -112,6 +112,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
assert_d CUSTOMER_ID_BASE_DIR assert_d CUSTOMER_ID_BASE_DIR
CUSTOMER_LOCATION_DIR="${CUSTOMER_ID_BASE_DIR}/${CUSTOMER_LOCATION}" CUSTOMER_LOCATION_DIR="${CUSTOMER_ID_BASE_DIR}/${CUSTOMER_LOCATION}"
CUST_LOC_DIR=$CUSTOMER_LOCATION_DIR
assert_d CUSTOMER_LOCATION_DIR assert_d CUSTOMER_LOCATION_DIR
# readonly zone_groups=(${__zone_groups[@]}) # readonly zone_groups=(${__zone_groups[@]})
@ -143,6 +144,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
# TODO # TODO
# Zone aus /etc/zone_nr auslesen # Zone aus /etc/zone_nr auslesen
# #
readonly ZONE_GROUP=1
readonly ZONE=1 readonly ZONE=1
readonly CUST_BASE_DIR="${CUST_BASE_DIRS[$ZONE]}" readonly CUST_BASE_DIR="${CUST_BASE_DIRS[$ZONE]}"
assert_d CUST_BASE_DIR assert_d CUST_BASE_DIR
@ -203,10 +205,9 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
readonly DC2C_SYS_CONF_JSON="${CONF_SYS_DIR}/DC2C_conf.json" readonly DC2C_SYS_CONF_JSON="${CONF_SYS_DIR}/DC2C_conf.json"
readonly DC_PSA_DC_FILE="${DC_PSA_DIR}/$DC" readonly DC_PSA_DC_FILE="${DC_PSA_DIR}/$DC"
readonly ATBQT_ATB_PSA_BIN_FILE="${ATBAPP_PSA_DIR}/$ATBQT_BIN" readonly ATBQT_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ATBQT_INI"
readonly ATBQT_ATB_PSA_INI_FILE="${ATB_SYS_DIR}/$ATBQT_INI" readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_PSA_DIR}/$ATBQT_INI"
readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_SYS_DIR}/$ATBQT_INI" readonly ATBQT_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$ATBQT_INI"
readonly ATBQT_ETC_PSA_INI_FILE="${ETC_SYS_DIR}/$ATBQT_INI"
readonly ISMASMGRATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ISMASMGR_INI" readonly ISMASMGRATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ISMASMGR_INI"
readonly ISMASMGRAPP_PSA_INI_FILE="${ISMASMGR_PSA_DIR}/$ISMASMGR_INI" readonly ISMASMGRAPP_PSA_INI_FILE="${ISMASMGR_PSA_DIR}/$ISMASMGR_INI"
readonly ISMASMGRETC_PSA_INI_FILE="${ETC_PSA_DIR}/$ISMASMGR_INI" readonly ISMASMGRETC_PSA_INI_FILE="${ETC_PSA_DIR}/$ISMASMGR_INI"
@ -214,9 +215,9 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
readonly SYSCONF_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$SYSCONF_INI" readonly SYSCONF_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$SYSCONF_INI"
readonly SYSCONF_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$SYSCONF_INI" readonly SYSCONF_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$SYSCONF_INI"
readonly SYSCONF_SCF_PSA_INI_FILE="${SYSCONFIG_PSA_DIR}/$SYSCONF_INI" readonly SYSCONF_SCF_PSA_INI_FILE="${SYSCONFIG_PSA_DIR}/$SYSCONF_INI"
readonly SYSCTRL_ETC_PSA_INI_FILE="${ETC_SYS_DIR}/$SYSCTRL_INI" readonly SYSCTRL_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$SYSCTRL_INI"
readonly SYSCTRL_ATB_PSA_INI_FILE="${ATB_SYS_DIR}/$SYSCTRL_INI" readonly SYSCTRL_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$SYSCTRL_INI"
readonly SYSCTRL_SCF_PSA_INI_FILE="${SYSCONFIG_SYS_DIR}/$SYSCTRL_INI" readonly SYSCTRL_SCF_PSA_INI_FILE="${SYSCONFIG_PSA_DIR}/$SYSCTRL_INI"
readonly OPKG_CMDS_PSA_FILE="${OPKG_PSA_DIR}/opkg_commands" readonly OPKG_CMDS_PSA_FILE="${OPKG_PSA_DIR}/opkg_commands"
readonly TC_PSA_TC_FILE="${ATBAPP_PSA_DIR}/$TARIFF_CURRENT" readonly TC_PSA_TC_FILE="${ATBAPP_PSA_DIR}/$TARIFF_CURRENT"
readonly PSA_UPDATE_CONF="${CUSTOMER_LOCATION_DIR}/update.conf" readonly PSA_UPDATE_CONF="${CUSTOMER_LOCATION_DIR}/update.conf"
@ -272,7 +273,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
assert_f DC2C_SYS_CASH_JSON assert_f DC2C_SYS_CASH_JSON
assert_f DC_PSA_DC_FILE assert_f DC_PSA_DC_FILE
# assert_f ATBQT_ATB_PSA_BIN_FILE
assert_f ATBQT_ATB_PSA_INI_FILE assert_f ATBQT_ATB_PSA_INI_FILE
assert_f ATBQT_APP_PSA_INI_FILE assert_f ATBQT_APP_PSA_INI_FILE
assert_f ATBQT_ETC_PSA_INI_FILE assert_f ATBQT_ETC_PSA_INI_FILE
@ -347,9 +347,10 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
readonly KNOWN_FILES=(${KNOWN_CONF_FILES[@]} \ readonly KNOWN_FILES=(${KNOWN_CONF_FILES[@]} \
${KNOWN_INI_FILES[@]} \ ${KNOWN_INI_FILES[@]} \
${DC_PSA_DC_FILE##*${CUSTOMER_ID}/} \
${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/}) ${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/})
log_debug "known conf/ini_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]}"

157
update_psa_helpers
View File

@ -42,6 +42,10 @@ copy () {
continue continue
fi fi
# macht fuer dc keinen sinn
# local sysdir=$(echo $f |
# sed -E -e s'=(.*szeged/[0-9]/[0-9])(.*)(/.*)=\2=g')
copy_necessary=1 copy_necessary=1
PERCENT=$((PERCENT+1)) PERCENT=$((PERCENT+1))
@ -51,11 +55,13 @@ copy () {
local readonly __m="${CUSTOMER_ID_BASE_DIR}/${f}" local readonly __m="${CUSTOMER_ID_BASE_DIR}/${f}"
local __p="" local __p=""
# echo "TEST -> $sysdir/$__f"
if grep -qE "^.*$DC\s*$" <<< ${f}; then if grep -qE "^.*$DC\s*$" <<< ${f}; then
__p=" ${DC_SYS_DIR}/${__f}" __p="${DC_SYS_DIR}/${__f}"
log_debug "$func:${LINENO}: __m=$__m" log_debug "$func:${LINENO}: __m=$__m"
elif grep -qE "^.*[.]json\s*$" <<< ${f}; then elif grep -qE "^.*[.]json\s*$" <<< ${f}; then
__p=" ${CONF_SYS_DIR}/${__f}" __p="${CONF_SYS_DIR}/${__f}"
log_debug "$func:${LINENO}: __m=$__m" log_debug "$func:${LINENO}: __m=$__m"
elif grep -qE "^.*[.]ini\s*$" <<< ${f}; then elif grep -qE "^.*[.]ini\s*$" <<< ${f}; then
if [ "$__f" = "$ATBQT_INI" ]; then if [ "$__f" = "$ATBQT_INI" ]; then
@ -158,72 +164,93 @@ check_md5_for_changed_json_and_ini_files () {
readarray -td' ' files <<< "$1" readarray -td' ' files <<< "$1"
local readonly __cl=$CUSTOMER_LOCATION local readonly __cl=$CUSTOMER_LOCATION
for file in ${files[@]}; do for file in ${files[@]}; do
# .../szeged/1/1...
log_debug "$func:${LINENO} checking file=${file}..." log_debug "$func:${LINENO} checking file=${file}..."
local __fsuffix=${file##*.} local __fs=${file##*.}
local __bn=$(basename $file .$__fsuffix) # local __bn=$(basename $file .$__fsuffix)
if [[ "$file" =~ .*dc2c.hex.* ]]; then # local __key_suffix=$(echo $file |
js_key=".dc.dc2c.$__bn" # sed -E -e 's=(.*[0-9]/[0-9])([^.]+)(.*)=\2=g' -e 's=/=.=g')
js_key=""
case $file in
*.ini | *.json | *.hex)
set -x
local __key_suffix=$(echo $file |
sed -E -e 's=(.*[0-9]/[0-9])([^.]+)(.*)=\2=g' -e 's=/=.=g')
js_key=".$__fs.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)" md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
elif [[ "$file" =~ .*cash[.]json.* ]]; then set +x
js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.$__bn"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)" ;;
elif [[ "$file" =~ .*print[0-9][0-9][.]json.* ]]; then # *.hex)
js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.$__bn" # js_key=$(echo $file |
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # sed -E -e 's=(.*szeged)([^.]+)(.*)=\2=g' -e 's=/=.=g')
md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)" # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
elif [[ "$file" =~ .*conf[.]json.* ]]; then # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.DC2C_conf" # ;;
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) *)
md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)" log_crit "$func:${LINENO} unknown file=${file}"
elif [[ "$file" =~ .*serial[.]json.* ]]; then ;;
js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.DC2C_serial" esac
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)" #if [[ "$file" =~ .*dc2c.hex.* ]]; then
elif [[ "$file" =~ .*atb/ATBQT[.]ini.* ]]; then # js_key=$(echo $file |
js_key=".ini.$__cl.zg[1].z[1].etc.atb.ATBQT" # sed -E -e 's=(.*$CUSTOMER_LOCATION)([^.]+)(.*)=\2=g'
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # -e 's=/=.=g')
md5sum_repository="$(md5_of $ATB_ATBQT_INI_FULL)" # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
elif [[ "$file" =~ .*ATBQT[.]ini.* ]]; then # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
js_key=".ini.$__cl.zg[1].z[1].opt.app.ATBAPP.ATBQT" #else
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # if [[ "$file" =~ .*cash[.]json.* ]]; then
md5sum_repository="$(md5_of $ATBQT_INI_FULL)" # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
elif [[ "$file" =~ .*atb/sysconfig[.]ini.* ]]; then # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
js_key=".ini.$__cl.zg[1].z[1].etc.atb.sysconfig" # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # elif [[ "$file" =~ .*print[0-9][0-9][.]json.* ]]; then
md5sum_repository="$(md5_of $ATB_SYSCONFIG_INI_FULL)" # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
elif [[ "$file" =~ .*sysconfig[.]ini.* ]]; then # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.sysconfig" # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # elif [[ "$file" =~ .*conf[.]json.* ]]; then
md5sum_repository=$(md5_of $SYSCONFIG_SYSCONFIG_INI_FULL) # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
elif [[ "$file" =~ .*atb/SystemControl[.]ini.* ]]; then # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
js_key=".ini.$__cl.zg[1].z[1].etc.atb.SystemControl" # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # elif [[ "$file" =~ .*serial[.]json.* ]]; then
md5sum_repository="$(md5_of $ATB_SYSCTRL_INI_FULL)" # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
elif [[ "$file" =~ .*SystemControl[.]ini.* ]]; then # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.SystemControl" # md5sum_repository="$(md5_of $CUSTOMER_ID_BASE_DIR/$file)"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) ####################################################################
md5sum_repository=$(md5_of $SYSCONFIG_SYSCTRL_INI_FULL) ## ATBQT.ini
elif [[ "$file" =~ .*atb/ISMASMgr[.]ini.* ]]; then ####################################################################
js_key=".ini.$__cl.zg[1].z[1].etc.atb.ISMASMgr" # elif [[ "$file" =~ .*/$ATBQT_INI.* ]]; then
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
md5sum_repository="$(md5_of $ATB_ISMASMGR_INI_FULL)" # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
elif [[ "$file" =~ .*etc/ISMASMgr[.]ini.* ]]; then # md5sum_repository=$(md5_of $CUSTOMER_ID_BASE_DIR/$file)
js_key=".ini.$__cl.zg[1].z[1].etc.ISMASMgr" ####################################################################
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) ## sysconfig.ini
md5sum_repository="$(md5_of $ATB_ISMASMGR_INI_FULL)" ####################################################################
elif [[ "$file" =~ .*ISMASMgr/ISMASMgr[.]ini.* ]]; then # elif [[ "$file" =~ .*/$SYSCONF_INI.* ]]; then
js_key=".ini.$__cl.zg[1].z[1].opt.app.ISMASMgr.ISMASMgr" # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
md5sum_repository=$(md5_of $ISMASMGR_ISMASMGR_INI_FULL) # md5sum_repository=$(md5_of $CUSTOMER_ID_BASE_DIR/$file)
elif [[ "$file" =~ .*sysconfig/ISMASMgr[.]ini.* ]]; then ####################################################################
js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.ISMASMgr" ## SystemControl.ini
md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) ####################################################################
md5sum_repository=$(md5_of $SYSCONFIG_ISMASMGR_INI_FULL) # elif [[ "$file" =~ .*/$SYSCTRL_INI.* ]]; then
else # js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
continue # md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
fi # md5sum_repository=$(md5_of $CUSTOMER_ID_BASE_DIR/$file)
####################################################################
## ISMASMgr.ini
####################################################################
# elif [[ "$file" =~ .*/$ISMASMMGR_INI.* ]]; then
# js_key=".ini.$__cl.zg[$ZONE_GROUP].z[$ZONE]$__key_suffix"
# md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key)
# md5sum_repository=$(md5_of $CUSTOMER_ID_BASE_DIR/$file)
# fi
#fi
test -z $js_key && continue
PERCENT=$((PERCENT+1)) PERCENT=$((PERCENT+1))
test $PERCENT -gt 100 && PERCENT=100 test $PERCENT -gt 100 && PERCENT=100