diff --git a/read_config b/read_config index 5099ad3..1559282 100755 --- a/read_config +++ b/read_config @@ -112,6 +112,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once assert_d CUSTOMER_ID_BASE_DIR CUSTOMER_LOCATION_DIR="${CUSTOMER_ID_BASE_DIR}/${CUSTOMER_LOCATION}" + CUST_LOC_DIR=$CUSTOMER_LOCATION_DIR assert_d CUSTOMER_LOCATION_DIR # readonly zone_groups=(${__zone_groups[@]}) @@ -143,6 +144,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once # TODO # Zone aus /etc/zone_nr auslesen # + readonly ZONE_GROUP=1 readonly ZONE=1 readonly CUST_BASE_DIR="${CUST_BASE_DIRS[$ZONE]}" assert_d CUST_BASE_DIR @@ -203,9 +205,9 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once readonly DC2C_SYS_CONF_JSON="${CONF_SYS_DIR}/DC2C_conf.json" readonly DC_PSA_DC_FILE="${DC_PSA_DIR}/$DC" - readonly ATBQT_ATB_PSA_INI_FILE="${ATB_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_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ATBQT_INI" + readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_PSA_DIR}/$ATBQT_INI" + readonly ATBQT_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$ATBQT_INI" readonly ISMASMGRATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ISMASMGR_INI" readonly ISMASMGRAPP_PSA_INI_FILE="${ISMASMGR_PSA_DIR}/$ISMASMGR_INI" readonly ISMASMGRETC_PSA_INI_FILE="${ETC_PSA_DIR}/$ISMASMGR_INI" @@ -213,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_ATB_PSA_INI_FILE="${ATB_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_ATB_PSA_INI_FILE="${ATB_SYS_DIR}/$SYSCTRL_INI" - readonly SYSCTRL_SCF_PSA_INI_FILE="${SYSCONFIG_SYS_DIR}/$SYSCTRL_INI" + readonly SYSCTRL_ETC_PSA_INI_FILE="${ETC_PSA_DIR}/$SYSCTRL_INI" + readonly SYSCTRL_ATB_PSA_INI_FILE="${ATB_PSA_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 TC_PSA_TC_FILE="${ATBAPP_PSA_DIR}/$TARIFF_CURRENT" readonly PSA_UPDATE_CONF="${CUSTOMER_LOCATION_DIR}/update.conf" @@ -343,11 +345,12 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once ${ATBQT_APP_PSA_INI_FILE##*${CUSTOMER_ID}/} \ ${ATBQT_ETC_PSA_INI_FILE##*${CUSTOMER_ID}/}) - readonly KNOWN_FILES=(${KNOWN_CONF_FILES[@]} \ - ${KNOWN_INI_FILES[@]} \ + readonly KNOWN_FILES=(${KNOWN_CONF_FILES[@]} \ + ${KNOWN_INI_FILES[@]} \ + ${DC_PSA_DC_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 tab=$'\t' log_debug "$tab$tab ${KNOWN_FILES[$i]}"