jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of /srv/git/myshellconfig

Browse source
This commit is contained in:
Jakobus Schürz 2020-10-25 11:14:09 +01:00
commit 741e1b626a
2 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bashrc_add
View file

@ -36,9 +36,10 @@ if [[ $- = *i* ]] ; then
[ -z "${GIT_AUTHOR_EMAIL+x}" ] && export GIT_AUTHOR_EMAIL=$USEREMAIL
[ -z "${GIT_COMMITTER_NAME+x}" ] && export GIT_COMMITTER_NAME=$FULLNAME
[ -z "${GIT_COMMITTER_EMAIL+x}" ] && export GIT_COMMITTER_EMAIL=$USEREMAIL
[ -z "${MYSHELLCONFIG_GIT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_TIMEOUT=5s
[ -z "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT=20s
[ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && MYSHELLCONFIG_GIT_SYNC=true
[ -z "${MYSHELLCONFIG_GIT_TIMEOUT+x}" ] && export MYSHELLCONFIG_GIT_TIMEOUT=5s
[ -z "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT+x}" ] && export MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT=20s
[ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && export MYSHELLCONFIG_GIT_SYNC=true
[ -z "${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES_DEFAULT+x}" ] && export MYSHELLCONFIG_GIT_UPDATE_SUBMODULES_DEFAULT=true
# hardcoded git
export SGIT="git -C ${MYSHELLCONFIG_BASE}"

14
bin/git-myshellconfig-checkout
View file

@ -81,13 +81,8 @@ EOF
fi
loginfo "+-----update submodules $(date) ---------------------------------+"
#cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
#
#+-----update submodules $(date) ---------------------------------+
#
#EOF
if ${MYSHELLCONFIG_GIT_UPDATE_SUBMODLUES-${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES_DEFAULT-true}}; then
logdebug "update submodules"
rc=0
logdebug "update submodules" >&2
@ -99,11 +94,8 @@ $SGIT submodule foreach "git branch -u origin/master master" 1>>"${MYSHELLCONFI
$SGIT submodule update --recursive --remote --merge 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1 || { logwarn " update submodules failed on update"; rc=9; }
logdebug "submodules updated" >&2
loginfo << EOF >> "${MYSHELLCONFIG_LOGFILE}"
logdebug "update submodules ENDE"
+-----ENDE $(date) ---------------------------------+
EOF
EXIT
exit $rc