change variable-name
This commit is contained in:
parent
29e8ad1fc5
commit
ebe4f43c17
1 changed files with 11 additions and 11 deletions
|
@ -88,19 +88,19 @@ if ! $SSHS; then
|
||||||
#*term*|*linux*)
|
#*term*|*linux*)
|
||||||
*term*)
|
*term*)
|
||||||
|
|
||||||
if [ -d "${MSC_BASE}" -a $($SGIT status 1>/dev/null 2>&1; echo $?) -eq 0 ]; then
|
if [ -d "${MSC_BASE}" -a $($MSC_GIT status 1>/dev/null 2>&1; echo $?) -eq 0 ]; then
|
||||||
[ -d "${MSC_LOGDIR}" ] || mkdir -p "${MSC_LOGDIR}"
|
[ -d "${MSC_LOGDIR}" ] || mkdir -p "${MSC_LOGDIR}"
|
||||||
if ! $SGIT rev-parse --git-dir > /dev/null 2>&1 ; then
|
if ! $MSC_GIT rev-parse --git-dir > /dev/null 2>&1 ; then
|
||||||
loginfo "Init ${MSC_BASE} as git-repo" >&2
|
loginfo "Init ${MSC_BASE} as git-repo" >&2
|
||||||
$SGIT init
|
$MSC_GIT init
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Update Userinformations for git
|
# Update Userinformations for git
|
||||||
$SGIT config user.email "${USERNAME}"
|
$MSC_GIT config user.email "${USERNAME}"
|
||||||
$SGIT config user.name "${FULLNAME}"
|
$MSC_GIT config user.name "${FULLNAME}"
|
||||||
|
|
||||||
# set upstream only if not detached
|
# set upstream only if not detached
|
||||||
[ $($SGIT rev-parse --abbrev-ref HEAD) != "HEAD" ] && $SGIT branch --set-upstream-to=${MSC_GIT_REMOTE_NAME}/$($SGIT rev-parse --abbrev-ref HEAD)
|
[ $($MSC_GIT rev-parse --abbrev-ref HEAD) != "HEAD" ] && $MSC_GIT branch --set-upstream-to=${MSC_GIT_REMOTE_NAME}/$($MSC_GIT rev-parse --abbrev-ref HEAD)
|
||||||
|
|
||||||
# sync repo with origin if git is reachable
|
# sync repo with origin if git is reachable
|
||||||
if ckrepo ; then
|
if ckrepo ; then
|
||||||
|
@ -130,12 +130,12 @@ if ! $SSHS; then
|
||||||
|
|
||||||
[ -d "${MSC_BASE}" ] && { loginfo create ${MSC_LOGDIR} >&2; mkdir -p "${MSC_LOGDIR}"; }
|
[ -d "${MSC_BASE}" ] && { loginfo create ${MSC_LOGDIR} >&2; mkdir -p "${MSC_LOGDIR}"; }
|
||||||
|
|
||||||
$SGIT config user.email "${USERNAME}"
|
$MSC_GIT config user.email "${USERNAME}"
|
||||||
$SGIT config user.name "${FULLNAME}"
|
$MSC_GIT config user.name "${FULLNAME}"
|
||||||
|
|
||||||
# Initialize Vundle as preconfigured Submodule
|
# Initialize Vundle as preconfigured Submodule
|
||||||
#$SGIT submodule update --init --recursive
|
#$MSC_GIT submodule update --init --recursive
|
||||||
#$SGIT submodule foreach 'git checkout master'
|
#$MSC_GIT submodule foreach 'git checkout master'
|
||||||
|
|
||||||
loginfo "sync config" >&2
|
loginfo "sync config" >&2
|
||||||
sync_config
|
sync_config
|
||||||
|
@ -148,7 +148,7 @@ if ! $SSHS; then
|
||||||
# not necessary any more. Vim plugins are updated through git submodules
|
# not necessary any more. Vim plugins are updated through git submodules
|
||||||
#vim -c "PluginInstall" -c ":qa!"
|
#vim -c "PluginInstall" -c ":qa!"
|
||||||
fi
|
fi
|
||||||
[ -z ${MSC_GIT_REMOTE_PUSH+x} ] || $SGIT remote set-url --push ${MSC_GIT_REMOTE_NAME} "${MSC_GIT_REMOTE_PUSH}"
|
[ -z ${MSC_GIT_REMOTE_PUSH+x} ] || $MSC_GIT remote set-url --push ${MSC_GIT_REMOTE_NAME} "${MSC_GIT_REMOTE_PUSH}"
|
||||||
;;
|
;;
|
||||||
*screen*)
|
*screen*)
|
||||||
loginfo "I'm in sceen/tmux now - no profily syncing" >&2
|
loginfo "I'm in sceen/tmux now - no profily syncing" >&2
|
||||||
|
|
Loading…
Reference in a new issue