Compare commits
3 Commits
33511a5bcb
...
515c77bed4
Author | SHA1 | Date | |
---|---|---|---|
515c77bed4 | |||
f2617d8151 | |||
4f9c6155e1 |
30
git_helpers
30
git_helpers
@ -90,12 +90,10 @@ clone_customer_repository () {
|
||||
log_debug "$func:${LINENO} cloning ${1} ..."
|
||||
if cd "./$WORKSPACE_DIR"
|
||||
then
|
||||
$(exec_git_command git clone "$1")
|
||||
exec_git_command git clone "$1"
|
||||
if [ $? -eq 0 ]; then
|
||||
log_debug "$func:${LINENO} cloning ${1} done"
|
||||
GIT_CLONE_EXECUTED=1
|
||||
rm -f $GIT_PULL_TMP
|
||||
rm -f $OPKG_CMDS_TMP
|
||||
# after cloning, cd into repository, and re-initialize,
|
||||
# setting the work-tree as "/". This has the effect that
|
||||
# a "git pull" will automatically fetched files in the
|
||||
@ -182,26 +180,20 @@ pull_customer_repository () {
|
||||
return 1
|
||||
fi
|
||||
|
||||
#local commit_before_pull=$(latest_commit)
|
||||
#if [ -z $commit_before_pull ]; then
|
||||
# log_warn "$func:${LINENO}: commit_before_pull empty"
|
||||
# cd_home ; return 1
|
||||
#fi
|
||||
#log_debug "$func:${LINENO}: commit_before_pull=$commit_before_pull"
|
||||
|
||||
rm -f "$OPKG_CMDS_TMP"
|
||||
rm -f "$GIT_PULL_TMP"
|
||||
|
||||
log_debug "$func:${LINENO}: executing 'git pull'..."
|
||||
log_crit "$func:${LINENO}: executing 'git pull'..."
|
||||
exec_git_command 'git pull'
|
||||
|
||||
# GIT_PULL_TMP created by hook post-merge. it contains the names of the
|
||||
# changed files.
|
||||
if [[ -f $GIT_PULL_TMP ]]; then
|
||||
# GIT_UPDATE_LOG updated by hook post-merge. it contains the names of the
|
||||
# changed files or opkg-commands to execute.
|
||||
# If 'git pull' has fetched new data, then there are lines starting with
|
||||
# DOWNLOAD or EXECUTE.
|
||||
grep -E -q "^[[:space:]]*(DOWNLOAD|EXECUTE)" "$GIT_UPDATE_LOG"
|
||||
if [ $? -eq 0]; then
|
||||
log_info "$func:${LINENO}: new data fetched from repository"
|
||||
cd_home; return 0
|
||||
fi
|
||||
|
||||
log_warn "$func:${LINENO}: no data fetched form repository"
|
||||
|
||||
log_warn "$func:${LINENO}: no data fetched from repository"
|
||||
cd_home; return 1
|
||||
}
|
||||
# pull_customer_repository customer_281
|
||||
|
31
log_helpers
31
log_helpers
@ -1,10 +1,6 @@
|
||||
#!/bin/bash
|
||||
# set -x
|
||||
|
||||
RED='\e[0;31m'
|
||||
GREEN='\e[0;32m'
|
||||
NC='\e[0m' # No Color
|
||||
|
||||
if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
|
||||
readonly log_helpers_sourced=${BASH_SOURCE[0]}
|
||||
|
||||
@ -33,51 +29,60 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
|
||||
return $log_level
|
||||
}
|
||||
|
||||
log() {
|
||||
# TODO: kann man wohl entfernen
|
||||
log_to_file() {
|
||||
if [[ $(("$(wc -l < $log_file)")) -ge $((100000)) ]]; then
|
||||
# remove first line
|
||||
sed -e 1d -i $log_file
|
||||
fi
|
||||
local msg="$(date +'%Y-%m-%d_%T'): $*"
|
||||
echo "log:$msg" >&2
|
||||
echo "$msg" >> $log_file
|
||||
}
|
||||
|
||||
log() {
|
||||
local msg="$(date +'%Y-%m-%d_%T'): $*"
|
||||
echo "log:$msg" >&2
|
||||
}
|
||||
|
||||
log_debug() {
|
||||
log_to_file "DEBUG $*"
|
||||
if [ $log_level -le $DEBUG ]; then
|
||||
log "DEBUG $*"
|
||||
fi
|
||||
}
|
||||
|
||||
log_info() {
|
||||
log_to_file "INFO $*"
|
||||
if [ $log_level -le $INFO ]; then
|
||||
log "${GREEN}INFO $*"
|
||||
log "INFO $*"
|
||||
fi
|
||||
}
|
||||
|
||||
log_warn() {
|
||||
log_to_file "WARN $*"
|
||||
if [ $log_level -le $WARN ]; then
|
||||
log "${RED}WARN $*"
|
||||
log "WARN $*"
|
||||
fi
|
||||
}
|
||||
|
||||
log_crit() {
|
||||
log_to_file "CRIT $*"
|
||||
if [ $log_level -le $CRIT ]; then
|
||||
log "${RED}CRIT $*"
|
||||
log "CRIT $*"
|
||||
fi
|
||||
}
|
||||
|
||||
log_error() {
|
||||
log_to_file "ERROR $*"
|
||||
if [ $log_level -le $ERROR ]; then
|
||||
log "${RED}ERROR $*"
|
||||
log "ERROR $*"
|
||||
fi
|
||||
}
|
||||
|
||||
log_fatal() {
|
||||
log_to_file "FATAL $*"
|
||||
if [ $log_level -le $FATAL ]; then
|
||||
log "${RED}FATAL $*"
|
||||
log "${RED}exiting ..."
|
||||
log "FATAL $*"
|
||||
log "exiting ..."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
@ -22,8 +22,9 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
|
||||
readonly UPDATEPSABEGIN=./.updatepsa/begin
|
||||
readonly UPDATEPSAEND=./.updatepsa/end
|
||||
|
||||
readonly OPKG_CMDS_TMP=/tmp/opkg_commands
|
||||
readonly GIT_PULL_TMP=/tmp/git_pull
|
||||
# name of file containing the logs following a 'git pull':
|
||||
# basically, there are two kinds of entries:
|
||||
readonly GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
|
||||
|
||||
readonly PROGRAM=`basename $0`
|
||||
readonly WORKSPACE_DIR=workspace
|
||||
|
Loading…
x
Reference in New Issue
Block a user