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:6bf95ba1314922393bdb8334393c68c0712f4275
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:szeged_preview_20230607
GerhardHoffmann:szeged_preview_20230609

No commits in common. "ba1f70fec4719f028de76269901a08742ea31e9f" and "6bf95ba1314922393bdb8334393c68c0712f4275" have entirely different histories.
ba1f70fec4 ... 6bf95ba131

2 changed files with 8 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
news_to_ismas
View File

@ -375,7 +375,9 @@ if [ ${news_to_ismas_sourced:-1} = "1" ]; then # include only once
current_settings_to_ismas () { current_settings_to_ismas () {
local func="${FUNCNAME[0]}" local func="${FUNCNAME[0]}"
local p=("$@") local p=("$@")
return 0
local data="#M=APISM#C=CMD_SENDVERSION#J= local data="#M=APISM#C=CMD_SENDVERSION#J=
{ {
\"VERSION_INFO\" : { \"VERSION_INFO\" : {
@ -412,11 +414,11 @@ if [ ${news_to_ismas_sourced:-1} = "1" ]; then # include only once
\"RAUC\" : \"$(rauc --version)\", \"RAUC\" : \"$(rauc --version)\",
\"OPKG\" : \"$(opkg --version)\", \"OPKG\" : \"$(opkg --version)\",
\"ATBQT\" : { \"ATBQT\" : {
\"VERSION\" : \"$($ATBQT_ATB_SYS_BIN_FILE -v | \"VERSION\" : \"$($ATBQT_SYS_FULL -v |
grep Version | grep Version |
sed -E -e 's/.*:\s*(.*)/\1/g')\", sed -E -e 's/.*:\s*(.*)/\1/g')\",
\"GIT_DESCRIBE\" : \"$($ATBQT_ATB_SYS_BIN_FILE -v | \"GIT_DESCRIBE\" : \"$($ATBQT_SYS_FULL -v |
grep git | grep git |
sed -E -e 's/.*:\s*(.*)/\1/g')\" sed -E -e 's/.*:\s*(.*)/\1/g')\"
}, },
\"PLUGINS\" : { \"PLUGINS\" : {

6
read_config
View File

@ -171,7 +171,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
readonly SYSCONFIG_PSA_DIR=${CUST_BASE_DIR}${SYSCONFIG_SYS_DIR} readonly SYSCONFIG_PSA_DIR=${CUST_BASE_DIR}${SYSCONFIG_SYS_DIR}
readonly ISMASMGR_PSA_DIR=${CUST_BASE_DIR}${ISMASMGR_SYS_DIR} readonly ISMASMGR_PSA_DIR=${CUST_BASE_DIR}${ISMASMGR_SYS_DIR}
readonly ATBQT_BIN="ATBQT"
readonly ATBQT_INI="ATBQT.ini" readonly ATBQT_INI="ATBQT.ini"
readonly ISMASMGR_INI="ISMASMgr.ini" readonly ISMASMGR_INI="ISMASMgr.ini"
readonly SYSCONF_INI="sysconfig.ini" readonly SYSCONF_INI="sysconfig.ini"
@ -180,7 +179,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
readonly DC="dc2c.hex" readonly DC="dc2c.hex"
readonly DC_SYS_DC_FILE="${DC_SYS_DIR}/$DC" readonly DC_SYS_DC_FILE="${DC_SYS_DIR}/$DC"
readonly ATBQT_ATB_SYS_BIN_FILE="${ATBAPP_SYS_DIR}/$ATBQT_BIN"
readonly ATBQT_ATB_SYS_INI_FILE="${ATB_SYS_DIR}/$ATBQT_INI" readonly ATBQT_ATB_SYS_INI_FILE="${ATB_SYS_DIR}/$ATBQT_INI"
readonly ATBQT_APP_SYS_INI_FILE="${ATBAPP_SYS_DIR}/$ATBQT_INI" readonly ATBQT_APP_SYS_INI_FILE="${ATBAPP_SYS_DIR}/$ATBQT_INI"
readonly ATBQT_ETC_SYS_INI_FILE="${ETC_SYS_DIR}/$ATBQT_INI" readonly ATBQT_ETC_SYS_INI_FILE="${ETC_SYS_DIR}/$ATBQT_INI"
@ -203,7 +201,6 @@ 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_SYS_DIR}/$ATBQT_INI" readonly ATBQT_ATB_PSA_INI_FILE="${ATB_SYS_DIR}/$ATBQT_INI"
readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_SYS_DIR}/$ATBQT_INI" readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_SYS_DIR}/$ATBQT_INI"
readonly ATBQT_ETC_PSA_INI_FILE="${ETC_SYS_DIR}/$ATBQT_INI" readonly ATBQT_ETC_PSA_INI_FILE="${ETC_SYS_DIR}/$ATBQT_INI"
@ -251,7 +248,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
assert_f DC_SYS_DC_FILE assert_f DC_SYS_DC_FILE
assert_f ZONE_FILE assert_f ZONE_FILE
assert_f CUST_ID_FILE assert_f CUST_ID_FILE
assert_f ATBQT_ATB_SYS_BIN_FILE
assert_f ATBQT_ATB_SYS_INI_FILE assert_f ATBQT_ATB_SYS_INI_FILE
assert_f ATBQT_APP_SYS_INI_FILE assert_f ATBQT_APP_SYS_INI_FILE
assert_f ATBQT_ETC_SYS_INI_FILE assert_f ATBQT_ETC_SYS_INI_FILE
@ -272,7 +268,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
@ -286,6 +281,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
assert_f SYSCTRL_ETC_PSA_INI_FILE assert_f SYSCTRL_ETC_PSA_INI_FILE
assert_f SYSCTRL_ATB_PSA_INI_FILE assert_f SYSCTRL_ATB_PSA_INI_FILE
assert_f SYSCTRL_SCF_PSA_INI_FILE assert_f SYSCTRL_SCF_PSA_INI_FILE
assert_f ATB_PSA_INI_FILE
assert_f TC_PSA_TC_FILE assert_f TC_PSA_TC_FILE
assert_f PSA_UPDATE_CONF assert_f PSA_UPDATE_CONF
assert_f OPKG_CMDS_PSA_FILE assert_f OPKG_CMDS_PSA_FILE