diff --git a/read_config b/read_config index bb994a3..655e31c 100755 --- a/read_config +++ b/read_config @@ -132,11 +132,11 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once check_sanity_of_repository () { local func="${FUNCNAME[0]}" - + if [ "$PWD" != "$WORKING_DIRECTORY" ]; then log_fatal "$func:${LINENO} PD != WD ($PWD != $WORKING_DIRECTORY)" fi - + assert_d CUSTOMER_ID_BASE_DIR CUSTOMER_LOCATION_DIR="$CUSTOMER_ID_BASE_DIR" @@ -168,7 +168,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once # readonly CUST_BASE_DIRS=(${__customer_base_dirs[@]}) # assert_a CUST_BASE_DIRS - readonly CUST_BASE_DIR="$CUSTOMER_ID_BASE_DIR" #readonly CUST_BASE_DIR="${CUST_BASE_DIRS[$ZONE]}" #assert_d CUST_BASE_DIR @@ -202,10 +201,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once readonly ISMASMGR_INI="ISMASMgr.ini" readonly SYSCONF_INI="sysconfig.ini" readonly SYSCTRL_INI="SystemControl.ini" - readonly TARIFF_CURRENT="tariff.current" readonly DC="dc2c.bin" - readonly TARIFF_SUMMER="summer_tariff.json" - readonly TARIFF_WINTER="winter_tariff.json" readonly DC_SYS_DC_FILE="${DC_SYS_DIR}/$DC" readonly ATBQT_ATB_SYS_BIN_FILE="${ATBAPP_SYS_DIR}/$ATBQT_BIN" @@ -224,14 +220,11 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once readonly SYSCTRL_SCF_SYS_INI_FILE="${SYSCONFIG_SYS_DIR}/$SYSCTRL_INI" # readonly ZONE_FILE="$ETC_SYS_DIR/zone_nr" readonly CUST_ID_FILE="$ETC_SYS_DIR/cust_nr" - readonly TC_SYS_TC_FILE="${ATBAPP_SYS_DIR}/$TARIFF_CURRENT" readonly OPKG_CMDS_SYS_FILE="${OPKG_SYS_DIR}/opkg_commands" readonly DC2C_SYS_SERIAL_JSON="${CONF_SYS_DIR}/DC2C_serial.json" readonly DC2C_SYS_CASH_JSON="${CONF_SYS_DIR}/DC2C_cash.json" readonly DC2C_SYS_CONF_JSON="${CONF_SYS_DIR}/DC2C_conf.json" readonly DC_PSA_DC_FILE="${DC_PSA_DIR}/$DC" - readonly TARIFF_SYS_SUMMER="${TARIFF_SYS_DIR}${TARIFF_SUMMER}" - readonly TARIFF_SYS_WINTER="${TARIFF_SYS_DIR}${TARIFF_WINTER}" readonly ATBQT_ATB_PSA_INI_FILE="${ATB_PSA_DIR}/$ATBQT_INI" readonly ATBQT_APP_PSA_INI_FILE="${ATBAPP_PSA_DIR}/$ATBQT_INI" @@ -247,7 +240,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once 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" readonly DC2C_PSA_SERIAL_JSON="${CONF_PSA_DIR}/DC2C_serial.json" readonly DC2C_PSA_CASH_JSON="${CONF_PSA_DIR}/DC2C_cash.json" @@ -294,7 +286,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once assert_f SYSCTRL_ETC_SYS_INI_FILE assert_f SYSCTRL_ATB_SYS_INI_FILE assert_f SYSCTRL_SCF_SYS_INI_FILE - assert_f TC_SYS_TC_FILE assert_f OPKG_CMDS_SYS_FILE assert_f DC2C_SYS_CONF_JSON assert_f DC2C_SYS_SERIAL_JSON @@ -314,7 +305,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once assert_f SYSCTRL_ETC_PSA_INI_FILE assert_f SYSCTRL_ATB_PSA_INI_FILE assert_f SYSCTRL_SCF_PSA_INI_FILE - assert_f TC_PSA_TC_FILE # assert_f PSA_UPDATE_CONF assert_f OPKG_CMDS_PSA_FILE assert_f DC2C_PSA_CONF_JSON