modify updated
This commit is contained in:
parent
ec669d7872
commit
4637865fd3
2 changed files with 22 additions and 8 deletions
|
@ -80,6 +80,15 @@ EOF
|
||||||
|
|
||||||
SCRIPTENTRY
|
SCRIPTENTRY
|
||||||
# define functions
|
# define functions
|
||||||
|
|
||||||
|
lastupdatesubmodules() {
|
||||||
|
date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules
|
||||||
|
}
|
||||||
|
lastupdaterepo() {
|
||||||
|
date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_repo
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
ckrepo () {
|
ckrepo () {
|
||||||
# check if remote repo is reachable
|
# check if remote repo is reachable
|
||||||
if $MYSHELLCONFIG_GIT_SYNC; then
|
if $MYSHELLCONFIG_GIT_SYNC; then
|
||||||
|
|
|
@ -59,18 +59,23 @@ done
|
||||||
#echo -n " remote: ${MYSHELLCONFIG_GIT_REMOTE_NAME}, branch: ${MYSHELLCONFIG_GIT_BRANCH}: "
|
#echo -n " remote: ${MYSHELLCONFIG_GIT_REMOTE_NAME}, branch: ${MYSHELLCONFIG_GIT_BRANCH}: "
|
||||||
|
|
||||||
# Check for updates in submodules only if last check was INTERVALL hours in the past
|
# Check for updates in submodules only if last check was INTERVALL hours in the past
|
||||||
updated=$(cat ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules 2>/dev/null || echo 0 )
|
if [ $(cat ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules 2>/dev/null || echo 0 ) \
|
||||||
logtrace "dosubmodupdate before: $dosubmodupdate"
|
-lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") \
|
||||||
if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") -a ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then
|
-a ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then
|
||||||
|
[ -z "${dosubmodupdate+x}" ] && dorepoupdate="true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $(cat ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules 2>/dev/null || echo 0 ) \
|
||||||
|
-lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") \
|
||||||
|
-a ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then
|
||||||
[ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true"
|
[ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true"
|
||||||
fi
|
fi
|
||||||
logtrace "dosubmodupdate after: $dosubmodupdate"
|
|
||||||
|
|
||||||
#echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2
|
#echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2
|
||||||
loginfo "fetch repo${dosubmodupdate:+ and submodules}"
|
loginfo "fetch ${dorepoupdate:+ repo}${dosubmodupdate:+ and submodules}"
|
||||||
$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 2>>"${MYSHELLCONFIG_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; }
|
$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 2>>"${MYSHELLCONFIG_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; }
|
||||||
if ${dosubmodupdate:-false}; then
|
if ${dosubmodupdate:-false}; then
|
||||||
date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules
|
lastupdatesubmodules
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Check for local changes:" >> "${MYSHELLCONFIG_LOGFILE}"
|
echo "Check for local changes:" >> "${MYSHELLCONFIG_LOGFILE}"
|
||||||
|
@ -112,7 +117,7 @@ loginfo "repo${dosubmodupdate:+ and submodules} synced"
|
||||||
loginfo "update and commit submodules"
|
loginfo "update and commit submodules"
|
||||||
logdebug "$($SGIT submodule update --remote)"
|
logdebug "$($SGIT submodule update --remote)"
|
||||||
logdebug "$($SGIT commit -a -m 'update submodules')"
|
logdebug "$($SGIT commit -a -m 'update submodules')"
|
||||||
date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules
|
lastupdatesubmodules
|
||||||
logwarn "submodules synced"
|
logwarn "submodules synced"
|
||||||
fi
|
fi
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue