diff --git a/bashrc_add b/bashrc_add index 37e79b9..4858301 100755 --- a/bashrc_add +++ b/bashrc_add @@ -39,8 +39,8 @@ if [[ $- = *i* ]] ; then [ -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 - [ -z "${MYSHELLCONFIG_GIT_SUBMODULE_SERVER_DEFUALt+x}" ] && export MYSHELLCONFIG_GIT_SUBMODULE_SERVER_DEFAULT="git://git.schuerz.at/github.com" + [ -z "${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT+x}" ] && export MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT=true + [ -z "${MYSHELLCONFIG_GIT_SUBMODULES_SERVER_DEFAULT+x}" ] && export MYSHELLCONFIG_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com" # hardcoded git export SGIT="git -C ${MYSHELLCONFIG_BASE}" diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 891de0c..ce73893 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -81,13 +81,13 @@ EOF fi -if ${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES-${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES_DEFAULT-true}}; then +if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then logdebug "update submodules" rc=0 $SGIT config --file=.gitmodules -l | \ grep url= | \ - awk -F "=" -v srv="${MYSHELLCONFIG_GIT_SUBMODULE_SERVER-${MYSHELLCONFIG_GIT_SUBMODULE_SERVER_DEFAULT}}" \ + awk -F "=" -v srv="${MYSHELLCONFIG_GIT_SUBMODULES_SERVER-${MYSHELLCONFIG_GIT_SUBMODULES_SERVER_DEFAULT}}" \ '{gsub(/^.*github.com/,srv,$2); print $1" "$2}' | \ while read a b; do logdebug "$SGIT config --file=.gitmodules ${a} ${b}" @@ -103,7 +103,7 @@ logdebug "update submodules" logdebug "submodules updated successfully" >&2 else - logdebug "Do not update submodules. It's denied by environment MYSHELLCONFIG_GIT_UPDATE_SUBMODULES: ${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES-${MYSHELLCONFIG_GIT_UPDATE_SUBMODULES_DEFAULT-true}}" + logdebug "Do not update submodules. It's denied by environment MYSHELLCONFIG_GIT_UPDATE_SUBMODULES: ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}" fi EXIT