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

improve output

Browse source
This commit is contained in:
Jakobus Schürz 2020-11-03 08:23:35 +01:00
parent 766bcc74e0
commit b611c49db2
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
myshell_git_sync
View file

@ -116,12 +116,14 @@ if ! $SSHS; then
else else
loginfo "Clone ${MYSHELLCONFIG_GIT_REMOTE} and configure git" >&2 loginfo "Clone ${MYSHELLCONFIG_GIT_REMOTE} and configure git" >&2
if $( timeout --foreground "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT}" git -C ${HOME} clone "${MYSHELLCONFIG_GIT_REMOTE}" "${MYSHELLCONFIG_BASE}" ); then if $( timeout --foreground "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT}" \
git -C ${HOME} clone --recurse-submodules "${MYSHELLCONFIG_GIT_REMOTE}" "${MYSHELLCONFIG_BASE}" ); then
: :
else else
MYSHELLCONFIG_GIT_REMOTE="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_HTTP}${MYSHELLCONFIG_GIT_REPO_NAME}" MYSHELLCONFIG_GIT_REMOTE="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_HTTP}${MYSHELLCONFIG_GIT_REPO_NAME}"
loginfo "Clone ${MYSHELLCONFIG_GIT_REMOTE} and configure git" >&2 loginfo "Clone ${MYSHELLCONFIG_GIT_REMOTE} (http, because other protocol is not reachable) and configure git" >&2
timeout --foreground "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT}" git -C ${HOME} clone "${MYSHELLCONFIG_GIT_REMOTE}" "${MYSHELLCONFIG_BASE}" || return 1 2>/dev/null || exit 1 timeout --foreground "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT}" \
git -C ${HOME} clone --recurse-submodules "${MYSHELLCONFIG_GIT_REMOTE}" "${MYSHELLCONFIG_BASE}" || return 1 2>/dev/null || exit 1
fi fi
@ -142,19 +144,20 @@ if ! $SSHS; then
create_symlinks "$MYSHELLCONFIG_BASE" create_symlinks "$MYSHELLCONFIG_BASE"
# Install vim Plugins # Install vim Plugins
#echo "Run Vim, and in Vim run :PluginInstall to install all Plugins" # echo "Run Vim, and in Vim run :PluginInstall to install all Plugins"
vim -c "PluginInstall" -c ":qa!" # not necessary any more. Vim plugins are updated through git submodules
#vim -c "PluginInstall" -c ":qa!"
fi fi
[ -z ${MYSHELLCONFIG_GIT_REMOTE_PUSH+x} ] || $SGIT remote set-url --push ${MYSHELLCONFIG_GIT_REMOTE_NAME} "${MYSHELLCONFIG_GIT_REMOTE_PUSH}" [ -z ${MYSHELLCONFIG_GIT_REMOTE_PUSH+x} ] || $SGIT remote set-url --push ${MYSHELLCONFIG_GIT_REMOTE_NAME} "${MYSHELLCONFIG_GIT_REMOTE_PUSH}"
;; ;;
*screen*) *screen*)
loginfo "I'm in sceen/tmux now" >&2 loginfo "I'm in sceen/tmux now - no profily syncing" >&2
;; ;;
*dumb*) *dumb*)
loginfo "Run with dumb terminal" 1>&2 loginfo "Run with dumb terminal - no profily syncing" 1>&2
;; ;;
*) *)
loginfo "Run with $TERM" >&2 loginfo "Run with $TERM - no profily syncing" >&2
;; ;;
esac esac
fi fi