general_utils

@@ -1,30 +0,0 @@
-#!/bin/bash
-# set -x 
-
-source ./log_helpers
-
-exec_process_substitution () {
-    local func="${FUNCNAME[0]}"
-    log_debug "$func:${LINENO} exec-ing [$*]"
-
-    exec {fd}< <(eval "$@")
-
-    local __result_code=$?
-    local ps_pid=$!  # remember pid of process substitution
-
-    local __result=""
-    while read __tmp <&$fd; do
-        if ! [ -z "$__tmp" ]; then
-            __result="${__result}$__tmp"
-        fi
-    done
-        
-    exec {fd}>&-    # close fd (i.e. process substitution)
-    wait $ps_pid    # wait for the subshell to finish
-
-    __result=${__result//[$'\r\n\t']/ } # remove \r\n\t from __result
-
-    log_debug "$func:${LINENO} result=$__result"
-    printf '%s' $__result
-    return $__result_code
-}

git.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -x 
+commit_before_pull=""
+
+save_commit_before_pull () {
+    commit_before_pull=$(git reflog | grep "HEAD@{0}" | cut -d" " -f1)
+    if ! [ -z "$commit_before_pull" ]; then
+        if grep -qE "^[[:xdigit:]]{6,}$" <<< $commit_before_pull; then
+            return 0
+        fi
+    fi
+    commit_before_pull=""
+    return 1
+}
+# save_commit_before_pull
+
+revert_to_commit_before_pull () {
+    if ! [ -z "$commit_before_pull" ]; then
+        if grep -qE "^[[:xdigit:]]{6,}$" <<< $commit_before_pull; then
+            `git reset --hard "$commit_before_pull"`
+            if [ $? -eq 0 ]; then
+                return 0
+            fi
+        fi
+    fi
+    return 1
+}
+# revert_to_commit_before_pull

git_helpers

@@ -1,14 +1,14 @@
 #!/bin/bash
 # set -x 
 
-source ./log_helpers
-source ./general_utils
-
-
 # if [ ${git_helpers_sourced:-1} = "1" ]; then
 #    readonly git_helpers_sourced=${BASH_SOURCE[0]}
+#else
+#    return 0
+#fi
 
 
+# source ./log_helpers
 
 readonly GIT_SSL_NO_VERIFY=true
 readonly repository_already_up_to_date=2
@@ -16,18 +16,36 @@ readonly repository_already_up_to_date=2
 #
 exec_git_command () {
     local func="${FUNCNAME[0]}"
+    
     log_debug "$func:${LINENO} exec-ing [$*]"
 
-    local __git_result=$(exec_process_substitution $*)
-    log_debug "$func:${LINENO} result=$__git_result"
+    exec {fd}< <(eval "$@")
 
-    printf '%s' "$__git_result"
+    # if [ "$*" = "git pull" ]; then
+    # else
+    #     exec {fd}< <($@)
+    # fi
+
+    local ps_pid=$!             # remember pid of process substitution
+
+    local git_result=""
+    while read t <&$fd; do
+        if ! [ -z "$t" ]; then
+            git_result="${git_result}$t"
+        fi
+    done
+        
+    exec {fd}>&-                # close fd (i.e. process substitution)
+    wait $ps_pid                # wait for the subshell to finish
+
+    git_result=$(printf "$git_result" | tr '\n' ' ')
+    printf "%s\n" $git_result
 }
 
 # 
 latest_commit () {
     local func="${FUNCNAME[0]}"
-    # git reflog -> 46c5896 HEAD@{0}: commit: Made update_helpers executable
+    # git reflog -> 46c5896 HEAD@{0}: commit: Made update_helpers.sh executable
     local c=$(git reflog | grep "HEAD@{0}" | cut -d" " -f1)
     if ! [ -z "$c" ]; then
         if grep -qE "^[[:xdigit:]]{6,}$" <<< $c; then
@@ -81,14 +99,14 @@ clone_customer_repository () {
                 cd -
             fi
         else
-            # the directory is not empty, so we assume the
-            # customer-repository has been cloned already
+            # the directory is not empty, so we assume the customer-repository
+            # has been cloned alread
             if ! [[ -d ./${workspace_dir}/$customer_id ]]; then
-                log_fatal "$func:${LINENO} "\
-                    "wrong repository: $(ls -d './${workspace_dir}/*')"
+                local m="wrong repository: $(ls -d './${workspace_dir}/*')"
+                log_fatal "$func:${LINENO} $m"
             else
-                local __m= "./${workspace_dir}/$customer_id exists"
-                log_debug "$func:${LINENO} $__m"
+                log_debug \
+                    "$func:${LINENO} ./${workspace_dir}/$customer_id exists"
                 return 0
             fi
         fi
@@ -111,7 +129,7 @@ cd_customer_repository () {
         fi
         
         if ! { cd $repository_dir; } ; then
-            log_crit "$func:${LINENO}: cannot cd to $repository_dir!"
+            log_crit "$func:${LINENO}: cannot change to $repository_dir!"
             return 1
         fi
 
@@ -250,4 +268,3 @@ changed_file_names () {
             "while in $PWD"
     fi
 }
-# fi

log_helpers

@@ -1,35 +1,38 @@
 #!/bin/bash
 # set -x 
 
-if [ ${log_helpers_sourced:-1} = "1" ]; then    # include ony once
-    readonly log_helpers_sourced=${BASH_SOURCE[0]}
+#if [ ${log_helpers_sourced:-1} = "1" ]; then
+#    readonly log_helpers_sourced=${BASH_SOURCE[0]}
+#else
+#    return 0
+#fi 
     
-    readonly log_file=/var/log/update_controller.log
-    if ! [ -f "$log_file" ]; then
+readonly log_file=/var/log/update_controller.log
+if ! [ -f "$log_file" ]; then
     touch $log_file
-    fi
+fi
 
-    readonly DEBUG=0
-    readonly INFO=1
-    readonly WARN=2
-    readonly CRIT=3
-    readonly ERROR=4
-    readonly FATAL=5
-    readonly MAX_DEBUG_LEVEL=6
+readonly DEBUG=0
+readonly INFO=1
+readonly WARN=2
+readonly CRIT=3
+readonly ERROR=4
+readonly FATAL=5
+readonly MAX_DEBUG_LEVEL=6
 
-    log_level=0
+log_level=0
 
-    set_dbg_level () {
+set_dbg_level () {
     if [ $1 < $MAX_DEBUG_LEVEL ]; then
         log_level=$1
     fi
-    }
+}
 
-    dbg_level () {
+dbg_level () {
     return $log_level
-    }
+}
 
-    log() {
+log() {
     if [[ $(("$(wc -l < $log_file)")) -ge $((100000)) ]]; then
         # remove first line
         sed -e 1d -i $log_file
@@ -37,44 +40,44 @@ if [ ${log_helpers_sourced:-1} = "1" ]; then    # include ony once
     local msg="$(date +'%Y-%m-%d_%T'): $*"
     printf "log:$msg\n" >&2
     printf "$msg\n" >> $log_file
-    }
+}
 
-    log_debug() {
+log_debug() {
     if [ $log_level = $DEBUG ]; then
         log "DEBUG $*"
     fi
-    }
+}
 
-    log_info() {
+log_info() {
     if [ $log_level -le $INFO ]; then
         log "INFO  $*"
     fi
-    }
+}
 
-    log_warn() {
+log_warn() {
     if [ $log_level -le $WARN ]; then
         log "WARN  $*"
     fi
-    }
+}
 
-    log_crit() {
+log_crit() {
     if [ $log_level -le $CRIT ]; then
         log "CRIT  $*"
     fi
-    }
+}
 
-    log_error() {
+log_error() {
     if [ $log_level -le $ERROR ]; then
         log "ERROR  $*"
     fi
-    }
+}
 
-    log_fatal() {
+log_fatal() {
     if [ $log_level -le $FATAL ]; then
         log "FATAL  $*"
         log "exiting ..."
         exit 1
     fi
-    }
-###############################################################################
-fi ### include guard
+}
+
+# log "test message1" "test message2"

read_config

@@ -1,14 +1,17 @@
 #!/bin/bash
 # set -x
 
-source ./log_helpers
+#if [ ${read_config_sourced:-1} = "1" ]; then
+#    readonly read_config_sourced=${BASH_SOURCE[0]}
+#else
+#    return 0
+#fi
 
-if [ ${read_config_sourced:-1} = "1" ]; then    # include only once
-    readonly read_config_sourced=${BASH_SOURCE[0]}
+# source ./log_helpers
 
-    # read config file (JSON syntax)
-    #
-    read_config() {
+# read config file (JSON syntax)
+#
+read_config() {
     local func="${FUNCNAME[0]}"
 
     # check customer_id
@@ -40,34 +43,27 @@ if [ ${read_config_sourced:-1} = "1" ]; then    # include only once
     fi
     
     # check customer_location
-        local customer_location=$(cat "$1" | jq -r .customer_location)
+    local customer_location="$(cat "$1" | jq -r .customer_location)"
     if [ -z "$customer_location" ]; then 
         log_fatal "$func:${LINENO}: customer_location not set in $1"
     fi
     
     readonly working_directory="$(cat "$1" | jq -r .working_directory)"
-        
     log_info "$func:${LINENO}: working_directory is $working_directory"
     
     readonly workspace_dir="$(cat "$1" | jq -r .workspace_dir)"
-
     local __customer_base_dir="$working_directory/${workspace_dir}"
     __customer_base_dir="${__customer_base_dir}/${customer_id}"
     __customer_base_dir="${__customer_base_dir}/${customer_location}"
     
-        readonly customer_location_dir="$__customer_base_dir"
-        
-        log_info "$func:${LINENO}: customer-location-dir is $customer_location_dir"
-        
     readonly customer_base_dir="${__customer_base_dir}/${zone_group}/${zone}"
-        
     log_info "$func:${LINENO}: customer-base-dir is $customer_base_dir"
 
     readonly opkg_cmds_file="${customer_base_dir}/etc/psa_update/opkg_commands"
-        
     log_info "$func:${LINENO}: opkg_cmds_file is $opkg_cmds_file"
-        return 0
-    }
-    # read_config UpdateController.conf
-fi
+
+    return 0
+}
+
+# read_config UpdateController.conf
 

update_psa

@@ -82,14 +82,12 @@ update() {
         fi
     done
 
-    # TODO: backup implementieren
     # Backup before any updates in case some previous test was wrong
     if ! backup_previous_version; then
         log_error "$func:${LINENO}: backup failed"
         revert_customer_repository ; exit 1
     fi
 
-    # TODO: implementieren, opkg pakete ausschliessen
     files=$(changed_file_names)
     if ! check_md5_for_changed_customer_files $files ; then
         log_error "$func:${LINENO}: new customer files wrong"
@@ -99,40 +97,31 @@ update() {
     if grep -qE ".*opkg_commands.*?" <<< $files; then
         # read opkg_cmds: each line respresents an opkg-command
         readarray opkg_commands < <(cat $opkg_cmds_file)
-        for opkg_c in "${opkg_commands[@]}"; do
-            if grep -qE "^\s*[#]+.*$" <<< $opkg_c; then
+        for opkg_command in "${opkg_commands[@]}"; do
+            if grep -qE "^\s*[#]+.*?$" <<< $opkg_command; then
                 continue    # found comment line
             fi
            
-            # package manipulation commands without package:
-            local cwp="update|upgrade|clean"
-            # informational commands without package:
-            cwp="${cwp}|list|list-installed|list-upgradable"
+            # FIXME: sollte nicht gebraucht werden 
+            opkg_command=${opkg_command//[$'\r\n\t']/ }
+            local package=$(printf '%s' "$opkg_command" | awk '{ print $NF }')
 
-            if grep -qE "^.*\s+($cwp)\s+.*$" <<< $opkg_c; then
-                local p=$(printf '%s' "$opkg_c" | awk '{ print $NF }')
             local opkg_output=()
-                if ! exec_opkg_info "$p" opkg_output; then
-                    log_error "$func:${LINENO}: opkg info $opkg_c failed"
+            if ! exec_opkg_info "$package" opkg_output; then
+                log_error "$func:${LINENO}: opkg --noaction $opkg_command failed"
                 revert_customer_repository ; exit 1
             fi
 
             if ! check_md5_for_opkg_packages opkg_output; then
-                    log_error "$func:${LINENO}: "\
-                        "wrong md5sum for opkg packages"
+                log_error "$func:${LINENO}: wrong md5sum for some opkg packages"
                 revert_customer_repository ; exit 1
             fi
-            fi
             
             # perform a dry-run and check if everything might work as expected. 
-            if ! exec_opkg_no_action $opkg_c; then
-                    log_error "$func:${LINENO}: "\
-                        "opkg --noaction $opkg_c failed"
-            fi
 
             # Actually execute the opkg command
-            if ! exec_opkg $opkg_c; then
-                log_error "$func:${LINENO}: exec_opkg $opkg_c failed"
+            if ! exec_opkg $opkg_command; then
+                log_error "$func:${LINENO}: exec_opkg $opkg_command failed"
                 fallback_to_previous_version
                 revert_customer_repository ; exit 1
             fi

update_psa_helpers

@@ -6,19 +6,25 @@
 #    return 0
 #fi
 
-source ./general_utils
-
 exec_opkg_command () {
     local func="${FUNCNAME[0]}"
+    
     log_debug "$func:${LINENO} exec-ing [$*]"
 
-    local __result=$(exec_process_substitution $*)
-    local __result_code=$?
+    exec {fd}< <(eval "$@")
+    local ps_pid=$!             # remember pid of process substitution
 
-    log_debug "$func:${LINENO} result=$__result"
+    local opkg_result=""
+    while read tmp <&$fd; do
+        if ! [ -z "$tmp" ]; then
+            opkg_result="${opkg_result}$tmp"
+        fi
+    done
         
-    printf '%s' "$__result"
-    return $__result_code
+    exec {fd}>&-                # close fd (i.e. process substitution)
+    wait $ps_pid                # wait for the subshell to finish
+
+    printf '%s' "$opkg_result"
 }
 
 # Fetch/merge updates from predefined repository using git.
@@ -49,34 +55,23 @@ check_md5_for_opkg_packages () {
     local func="${FUNCNAME[0]}"
     local -n opkg_output_ref=$1
     local package=""
-    local md5sum_opkg_info=""
+    local md5sum=""
     local filename=""
     for line in ${opkg_output_ref[@]}; do
-        log_info "$func:${LINENO}: line=$line"
         if grep -qE "^\s*Package\s*:.*?$" <<< "$line"; then
             package=${line#*:* }
+            printf 'package=%s\n' "$package"
         elif grep -qE "^\s*MD5Sum\s*:.*?$" <<< "$line"; then
-            md5sum_opkg_info=${line#*:* }
+            md5sum=${line#*:* }
+            printf 'md5sum=%s\n' "$md5sum"
         elif grep -qE "^\s*Filename\s*:.*?$" <<< "$line"; then
             filename=${line#*:* }
+            printf 'filename=%s\n' "$filename"
         fi
     done
 
-    local __update_conf="${customer_location_dir}/update.conf"
-    md5sum_repo=$(cat $__update_conf | jq -r .opkg.${package}.MD5Sum)
-    if ! [ -z $md5sum_repo ]; then
-        if [ "$md5sum_opkg_info" = "$md5sum_repo" ]; then
-            log_info "$func:${LINENO}: md5 $md5sum_repo OK for $package"
+    log_debug "$func:${LINENO}: $package | $md5sum | $filename"
     return 0
-        else
-            log_error "$func:${LINENO}: md5sum_repo [$md5sum_repo] "\
-                "!= md5sum_opkg_info [$md5sum_opkg_info] for $package"
-        fi
-    else
-        log_error "$func:${LINENO}: md5sum_repo empty"
-    fi
-
-    return 1
 }
 
 # In case the new checked-out files are not correct, revert the git
@@ -96,10 +91,10 @@ backup_previous_version () {
 
 exec_opkg_info () {
     local func="${FUNCNAME[0]}"
-    log_info "$func:${LINENO}: executing info $1"
+    log_info "$func:${LINENO}: executing $opkg_command"
     
     opkg_result=$(exec_opkg_command "opkg info $1")
-    if [ $? -eq 0 ]; then
+    
     # make sure the keywords start with '\n'
     opkg_result=$(sed -E -e "s/(^.*)(Package)(.*$)/\n\2\3/g"\
               -e "s/(^.*)(Version)(.*$)/\1\n\2\3/g"\
@@ -114,8 +109,7 @@ exec_opkg_info () {
               -e "s/(^.*)(Installed-Size)(.*$)/\1\n\2\3/g"\
               -e "s/(^.*)(Section)(.*$)/\1\n\2\3/g"\
               -e "s/(^.*[^-])(Size)(.*$)/\1\n\2\3/g"\
-                -e "s/(^.*)(Installed-Time)(.*$)/\1\n\2\3/g"
-                    <<< "$opkg_result")
+              -e "s/(^.*)(Installed-Time)(.*$)/\1\n\2\3/g" <<< "$opkg_result")
 
     local -n output_ref=$2
 
@@ -126,12 +120,8 @@ exec_opkg_info () {
     fi
     
     log_info "$func:${LINENO}: ... done"
-        # log_info "$func:${LINENO}: opkg_result=${output_ref[@]}"
+    log_info "$func:${LINENO}: opkg_result=${output_ref[@]}"
     return 0
-    fi
-
-    log_error "$func:${LINENO}: executing info $1"
-    return 1
 }
 
 # Try to install new opkg-packages (in case the are some
@@ -148,16 +138,11 @@ exec_opkg_no_action() {
 #
 exec_opkg () {
     local func="${FUNCNAME[0]}"
-    log_debug "$func:${LINENO}: executing $1"
+    log_info "$func:${LINENO}: executing $opkg_command"
+    
+    local opkg_result=$(exec_opkg_command "opkg $1")
 
-    local __opkg_result=$(exec_opkg_command "opkg $1")
-    if [ $? -eq 0 ]; then
-        log_info "$func:${LINENO}: opkg_result=$__opkg_result"
     return 0
-    fi
-
-    log_error "$func:${LINENO}: error executing $1"
-    return 1
 }
 
 # In case there was some error, re-install the previous package(s)