read_config

@@ -145,7 +145,7 @@ if [ ${read_config_sourced:-1} = "1" ]; then    # include only once
         # Zone aus /etc/zone_nr auslesen
         #
         readonly ZONE_GROUP=1
-        readonly ZONE=1
+        readonly ZONE=2
         readonly CUST_BASE_DIR="${CUST_BASE_DIRS[$ZONE]}"
         assert_d CUST_BASE_DIR
     
@@ -296,7 +296,6 @@ if [ ${read_config_sourced:-1} = "1" ]; then    # include only once
         assert_f DC2C_PSA_CONF_JSON
         assert_f DC2C_PSA_SERIAL_JSON
         assert_f DC2C_PSA_CASH_JSON
-        assert_f OPKG_CMDS_PSA_FILE
 
         readonly KNOWN_SYS_DIRS=($ETC_SYS_DIR
                                  $ATB_SYS_DIR

update_psa_helpers

@@ -42,15 +42,9 @@ copy () {
             continue
         fi
 
-        # TODO: szeged darf nicht sein
+        # macht fuer dc keinen sinn
-        # local readonlt __cl=$CUSTOMER_LOCATION
+        # local sysdir=$(echo $f |
-        # local readonly __q="'"
+        #               sed -E -e s'=(.*szeged/[0-9]/[0-9])(.*)(/.*)=\2=g')
-        # xxx='$('"echo $f | sed -E -e ${__q}s=(.*$__cl/[0-9]/[0-9])(.*)(/.*)=\2=g$__q"')'
-        # echo $xxx
-        # eval "echo $xxx"
-
-        local readonly __sysdir=$(echo $f |
-                            sed -E -e s'=(.*szeged/[0-9]/[0-9])(.*)(/.*)=\2=g')
 
         # TODO: kuerzen
     
@@ -61,53 +55,48 @@ copy () {
 
         local readonly __f=${f##*/}
         local readonly __m="${CUSTOMER_ID_BASE_DIR}/${f}"
-        local __p="${__sysdir}/${__f}"
+        local __p=""
 
         # echo "TEST -> $sysdir/$__f"
                 
-        # TODO: das kopieren in die system-verzeichnisse muss noch getestet
+        if grep -qE "^.*$DC\s*$" <<< ${f}; then
-        # werden. stimmt noch nicht so ganz.
+            __p="${DC_SYS_DIR}/${__f}"
-                
+            log_debug "$func:${LINENO}: __m=$__m"
-        #if grep -qE "^.*$DC\s*$" <<< ${f}; then
+        elif grep -qE "^.*tariff[0-9][0-9][.]json\s*$" <<< ${f}; then
-        #    __p="${DC_SYS_DIR}/${__f}"
+            __p="${TARIFF_SYS_DIR}/${__f}"
-        #    log_debug "$func:${LINENO}: __m=$__m"
+        elif grep -qE "^.*[.]json\s*$" <<< ${f}; then
-        #elif grep -qE "^.*tariff[0-9][0-9][.]json\s*$" <<< ${f}; then
+            __p="${CONF_SYS_DIR}/${__f}"
-        #    __p="${TARIFF_SYS_DIR}/${__f}"
+            log_debug "$func:${LINENO}: __m=$__m"
-        #elif grep -qE "^.*[.]json\s*$" <<< ${f}; then
+        elif grep -qE "^.*[.]ini\s*$" <<< ${f}; then
-        #    __p="${CONF_SYS_DIR}/${__f}"
+            if [ "$__f" = "$ATBQT_INI" ]; then
-        #    log_debug "$func:${LINENO}: __m=$__m"
+                log_debug "$func:${LINENO}: __m=$__m $ATB_SYS_DIR/$__f ${f%/*}"
-        #elif grep -qE "^.*[.]ini\s*$" <<< ${f}; then
+                if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
-        #    if [ "$__f" = "$ATBQT_INI" ]; then
+                    __p="$ATB_SYS_DIR/${__f}"
-        #        log_debug "$func:${LINENO}: __m=$__m $ATB_SYS_DIR/$__f ${f%/*}"
+                else
-        #        if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
+                    __p="$ATBAPP_SYS_DIR/${__f}"
-        #            __p="$ATB_SYS_DIR/${__f}"
+                fi
-        #        else
+            elif [ "$__f" = "$SYSTEM_CONTROL_INI" ]; then
-        #            __p="$ATBAPP_SYS_DIR/${__f}"
+                if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
-        #        fi
+                    __p="$ATB_SYS_DIR/${__f}"
-        #    elif [ "$__f" = "$SYSTEM_CONTROL_INI" ]; then
+                else
-        #        if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
+                    __p="$SYSCONFIG_SYS_DIR/${__f}"
-        #            __p="$ATB_SYS_DIR/${__f}"
+                fi
-        #        else
+            elif [ "$__f" = "$SYS_CONFIG_INI" ]; then
-        #            __p="$SYSCONFIG_SYS_DIR/${__f}"
+                if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
-        #        fi
+                    __p="$ATB_SYS_DIR/${__f}"
-        #    elif [ "$__f" = "$SYS_CONFIG_INI" ]; then
+                else
-        #        if grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
+                    __p="$SYSCONFIG_SYS_DIR/${__f}"
-        #            __p="$ATB_SYS_DIR/${__f}"
+                fi
-        #        else
+            elif [ "$__f" = "$ISMASMGR_INI" ]; then
-        #            __p="$SYSCONFIG_SYS_DIR/${__f}"
+                if grep -qE "$ISMASMGR_SYS_DIR" <<< "${f%/*}"; then
-        #        fi
+                    __p="$ISMASMGR_SYS_DIR/${__f}"
-        #    elif [ "$__f" = "$ISMASMGR_INI" ]; then
+                elif grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
-        #        if grep -qE "$ISMASMGR_SYS_DIR" <<< "${f%/*}"; then
+                    __p="$ATB_SYS_DIR/${__f}"
-        #            __p="$ISMASMGR_SYS_DIR/${__f}"
+                else
-        #        elif grep -qE "$ATB_SYS_DIR" <<< "${f%/*}"; then
+                    __p="$SYSCONFIG_SYS_DIR/${__f}"
-        #            __p="$ATB_SYS_DIR/${__f}"
+                fi
-        #        else
+            fi
-        #            __p="$SYSCONFIG_SYS_DIR/${__f}"
+        fi
-        #        fi
-        #    fi
-        #fi
-
-        echo "XXX-- __p=$__p"
             
         if [ ! -z "$__p" ]; then
             if cp "$__m" "$__p"; then

update_psa_impl

@@ -118,7 +118,7 @@ update_psa() {
     # check if the opkg-command-file has been changed during 'git pull'
     if grep -qE ".*opkg_commands.*?" <<< $changed_files; then
         # read opkg_cmds: each line respresents an opkg-command
-        readarray opkg_commands < <(cat $OPKG_CMDS_PSA_FILE)
+        readarray opkg_commands < <(cat $opkg_cmds_file)
         for opkg_c in "${opkg_commands[@]}"; do
             if grep -qE "^\s*[#]+.*$" <<< $opkg_c; then
                 continue    # found comment line