diff --git a/update_psa_helpers b/update_psa_helpers index e2ee4b9..63ca763 100755 --- a/update_psa_helpers +++ b/update_psa_helpers @@ -163,59 +163,63 @@ check_md5_for_changed_json_and_ini_files () { local __bn=$(basename $file .$__fsuffix) if [[ "$file" =~ .*dc2c.hex.* ]]; then js_key=".dc.dc2c.$__bn" - md5sum_update_conf=$(cat $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)" elif [[ "$file" =~ .*cash[.]json.* ]]; then js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.$__bn" - md5sum_update_conf=$(cat $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)" elif [[ "$file" =~ .*print[0-9][0-9][.]json.* ]]; then js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.$__bn" - md5sum_update_conf=$(cat $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)" elif [[ "$file" =~ .*conf[.]json.* ]]; then js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.DC2C_conf" - md5sum_update_conf=$(cat $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)" elif [[ "$file" =~ .*serial[.]json.* ]]; then js_key=".conf.$__cl.zg[1].z[1].etc.psa_config.DC2C_serial" - md5sum_update_conf=$(cat $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)" elif [[ "$file" =~ .*atb/ATBQT[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].etc.atb.ATBQT" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository="$(md5_of $ATB_ATBQT_INI_FULL)" elif [[ "$file" =~ .*ATBQT[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].opt.app.ATBAPP.ATBQT" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository="$(md5_of $ATBQT_INI_FULL)" elif [[ "$file" =~ .*atb/sysconfig[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].etc.atb.sysconfig" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository="$(md5_of $ATB_SYSCONFIG_INI_FULL)" elif [[ "$file" =~ .*sysconfig[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.sysconfig" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository=$(md5_of $SYSCONFIG_SYSCONFIG_INI_FULL) elif [[ "$file" =~ .*atb/SystemControl[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].etc.atb.SystemControl" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository="$(md5_of $ATB_SYSCTRL_INI_FULL)" elif [[ "$file" =~ .*SystemControl[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.SystemControl" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository=$(md5_of $SYSCONFIG_SYSCTRL_INI_FULL) elif [[ "$file" =~ .*atb/ISMASMgr[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].etc.atb.ISMASMgr" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) + md5sum_repository="$(md5_of $ATB_ISMASMGR_INI_FULL)" + elif [[ "$file" =~ .*etc/ISMASMgr[.]ini.* ]]; then + js_key=".ini.$__cl.zg[1].z[1].etc.ISMASMgr" + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository="$(md5_of $ATB_ISMASMGR_INI_FULL)" elif [[ "$file" =~ .*ISMASMgr/ISMASMgr[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].opt.app.ISMASMgr.ISMASMgr" - md5sum_update_conf=$(cat $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) elif [[ "$file" =~ .*sysconfig/ISMASMgr[.]ini.* ]]; then js_key=".ini.$__cl.zg[1].z[1].opt.app.sysconfig.ISMASMgr" - md5sum_update_conf=$(cat $UPDATE_CONF | jq -r $js_key) + md5sum_update_conf=$(cat $PSA_UPDATE_CONF | jq -r $js_key) md5sum_repository=$(md5_of $SYSCONFIG_ISMASMGR_INI_FULL) else continue @@ -398,6 +402,14 @@ check_for_apism () { nc localhost 7778 } +get_customer_id () { + echo $(cat CUST_ID_FILE) +} + +get_zone_nr () { + echo $(cat ZONE_FILE) +} + get_plugins () { local __plugins="" for __f in /opt/app/ATBAPP/plugins/*; do