Compare commits
12 Commits
szeged_pre
...
33511a5bcb
Author | SHA1 | Date | |
---|---|---|---|
33511a5bcb | |||
bd0d07f56f | |||
b8bc61daea | |||
27cd99f96a | |||
729778043a | |||
31e1aad762 | |||
f8c091ad0c | |||
e5e6c4c1cd | |||
95a9307631 | |||
fc1c2221b1 | |||
9b1549306d | |||
a8f691741b |
51
git_helpers
51
git_helpers
@@ -57,6 +57,18 @@ revert_to_commit_before_pull () {
|
|||||||
}
|
}
|
||||||
# revert_to_commit_before_pull
|
# revert_to_commit_before_pull
|
||||||
|
|
||||||
|
git_branch () {
|
||||||
|
# always relative to a git repository
|
||||||
|
echo $(git branch -a | grep '*' | awk '{ print $2 }')
|
||||||
|
}
|
||||||
|
|
||||||
|
git_customer_branch () {
|
||||||
|
if cd_customer_repository; then
|
||||||
|
customer_branch=$(git_branch)
|
||||||
|
cd_home;
|
||||||
|
echo $customer_branch
|
||||||
|
fi
|
||||||
|
}
|
||||||
# clone the customer repository in ./workspace.
|
# clone the customer repository in ./workspace.
|
||||||
# this is done only once.
|
# this is done only once.
|
||||||
#
|
#
|
||||||
@@ -89,7 +101,8 @@ clone_customer_repository () {
|
|||||||
# a "git pull" will automatically fetched files in the
|
# a "git pull" will automatically fetched files in the
|
||||||
# corresponding sytem-folders.
|
# corresponding sytem-folders.
|
||||||
if cd ${CUSTOMER_ID_BASE_DIR}; then
|
if cd ${CUSTOMER_ID_BASE_DIR}; then
|
||||||
# local res=$(exec_git_command git --git-dir=.git --work-tree=/ init)
|
# configure hooks directory
|
||||||
|
exec_git_command git config core.hooksPath .githooks
|
||||||
exec_git_command git checkout "$LOCAL_BRANCH"
|
exec_git_command git checkout "$LOCAL_BRANCH"
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
log_debug "$func:${LINENO} checked out local branch $LOCAL_BRANCH"
|
log_debug "$func:${LINENO} checked out local branch $LOCAL_BRANCH"
|
||||||
@@ -102,19 +115,13 @@ clone_customer_repository () {
|
|||||||
exec_git_command git reset --hard "$LOCAL_BRANCH"
|
exec_git_command git reset --hard "$LOCAL_BRANCH"
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
log_debug "$func:${LINENO} reset --hard $LOCAL_BRANCH"
|
log_debug "$func:${LINENO} reset --hard $LOCAL_BRANCH"
|
||||||
# re-initialized. copy post-merge (a hook called
|
CLONE_CUSTOMER_REPOSITORY=true
|
||||||
# when 'git pull' is executed and changed data
|
log_debug "$func:${LINENO} re-init of ${1} done"
|
||||||
# are received).
|
cd_home; return 0
|
||||||
if cp ".githooks/post-merge" ".git/hooks"; then
|
fi
|
||||||
log_debug "$func:${LINENO} copied post-merge to .git/hooks"
|
fi
|
||||||
CLONE_CUSTOMER_REPOSITORY=true
|
|
||||||
log_debug "$func:${LINENO} re-init of ${1} done"
|
|
||||||
cd_home; return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cd_home; return 1
|
cd_home; return 1
|
||||||
@@ -224,4 +231,20 @@ changed_file_names () {
|
|||||||
"while in $PWD"
|
"while in $PWD"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
# fi
|
|
||||||
|
get_blob () { # get the blob of the file(name) passed as $1
|
||||||
|
# note: this can be used for any file in the filesystem
|
||||||
|
echo $(git hash-object $1)
|
||||||
|
}
|
||||||
|
|
||||||
|
get_commit_for_blob () {
|
||||||
|
blob=$(get_blob $1)
|
||||||
|
if [ ! -z $blob ]; then
|
||||||
|
# search for the blob in all commits for the file(name) $1
|
||||||
|
echo $(echo $(git log --all --pretty=format:%H -- $1) |
|
||||||
|
xargs -I{} sh -c "git ls-tree {} -- $1 |
|
||||||
|
grep -q $blob && echo {}")
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
|
|||||||
readonly FATAL=5
|
readonly FATAL=5
|
||||||
readonly MAX_DEBUG_LEVEL=6
|
readonly MAX_DEBUG_LEVEL=6
|
||||||
|
|
||||||
log_level=0
|
log_level=$INFO
|
||||||
|
|
||||||
set_dbg_level () {
|
set_dbg_level () {
|
||||||
if [ $1 < $MAX_DEBUG_LEVEL ]; then
|
if [ $1 < $MAX_DEBUG_LEVEL ]; then
|
||||||
@@ -34,6 +34,7 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
|
|||||||
}
|
}
|
||||||
|
|
||||||
log() {
|
log() {
|
||||||
|
# TODO: kann man wohl entfernen
|
||||||
if [[ $(("$(wc -l < $log_file)")) -ge $((100000)) ]]; then
|
if [[ $(("$(wc -l < $log_file)")) -ge $((100000)) ]]; then
|
||||||
# remove first line
|
# remove first line
|
||||||
sed -e 1d -i $log_file
|
sed -e 1d -i $log_file
|
||||||
@@ -44,7 +45,7 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
|
|||||||
}
|
}
|
||||||
|
|
||||||
log_debug() {
|
log_debug() {
|
||||||
if [ $log_level = $DEBUG ]; then
|
if [ $log_level -le $DEBUG ]; then
|
||||||
log "DEBUG $*"
|
log "DEBUG $*"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@@ -28,11 +28,12 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
|
|||||||
readonly PROGRAM=`basename $0`
|
readonly PROGRAM=`basename $0`
|
||||||
readonly WORKSPACE_DIR=workspace
|
readonly WORKSPACE_DIR=workspace
|
||||||
|
|
||||||
GIT_CLONE_EXECUTED=0
|
|
||||||
|
|
||||||
EXITCODE=$RC_SUCCESS
|
EXITCODE=$RC_SUCCESS
|
||||||
CLONE_CUSTOMER_REPOSITORY=false
|
CLONE_CUSTOMER_REPOSITORY=false
|
||||||
|
|
||||||
|
GIT_CLONE_EXECUTED=0
|
||||||
|
APISM_RUNNING=0
|
||||||
|
|
||||||
# read config file (JSON syntax)
|
# read config file (JSON syntax)
|
||||||
read_config() {
|
read_config() {
|
||||||
local func="${FUNCNAME[0]}"
|
local func="${FUNCNAME[0]}"
|
||||||
|
19
update_psa
19
update_psa
@@ -64,18 +64,21 @@ if cd "$WORKING_DIRECTORY"; then
|
|||||||
|
|
||||||
if read_config
|
if read_config
|
||||||
then
|
then
|
||||||
|
check_default_route
|
||||||
|
check_route_to_repository "185.191.219.134" # git.mimbach.de
|
||||||
|
check_for_running_apism
|
||||||
if clone_customer_repository ${CUSTOMER_REPOSITORY_PATH}
|
if clone_customer_repository ${CUSTOMER_REPOSITORY_PATH}
|
||||||
then
|
then
|
||||||
check_sanity_of_repository
|
check_sanity_of_repository
|
||||||
|
|
||||||
#set_updates_available
|
set_updates_available
|
||||||
#while :
|
while :
|
||||||
#do
|
do
|
||||||
# sleep 5
|
sleep 5
|
||||||
# updates_available && break
|
updates_available && break
|
||||||
#done
|
done
|
||||||
|
|
||||||
# update_psa "testing"
|
#update_psa "testing"
|
||||||
update_psa
|
update_psa
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -373,8 +373,37 @@ cleanup_previous_version() {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
check_for_apism () {
|
check_for_running_apism () {
|
||||||
nc localhost 7778
|
local func="${FUNCNAME[0]}"
|
||||||
|
if nc localhost 7778
|
||||||
|
then
|
||||||
|
APISM_RUNNING=1
|
||||||
|
log_debug "$func:${LINENO}: APISM running..."
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
log_fatal "$func:${LINENO}: !!! APISM NOT RUNNING !!!"
|
||||||
|
}
|
||||||
|
|
||||||
|
check_default_route () {
|
||||||
|
local func="${FUNCNAME[0]}"
|
||||||
|
if ip route | head -n 1 | grep -q '^default'
|
||||||
|
then
|
||||||
|
log_debug "$func:${LINENO}: default route set"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
log_fatal "$func:${LINENO}: !!! NO DEFAULT ROUTE SET !!!"
|
||||||
|
}
|
||||||
|
|
||||||
|
check_route_to_repository () {
|
||||||
|
local func="${FUNCNAME[0]}"
|
||||||
|
# ip_address=$1, e.g. git.mimbach.de (185.191.219.134)
|
||||||
|
# 185.191.219.134 via 192.168.5.254 ...
|
||||||
|
if test "$#" -eq 1 && ip route get "$1" | head -n 1 | grep -q "^$1"
|
||||||
|
then
|
||||||
|
log_debug "$func:${LINENO}: route to repository available"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
log_fatal "$func:${LINENO}: !!! NO ROUTE TO REPO SET !!!"
|
||||||
}
|
}
|
||||||
|
|
||||||
get_customer_id () {
|
get_customer_id () {
|
||||||
|
Reference in New Issue
Block a user