|
|
@ -18,7 +18,7 @@ RC_PATH=$(dirname "$(readlink -f ${(%):-%x})") |
|
|
|
|
|
|
|
|
# Mise à jour automatique à partir du repo distant |
|
|
# Mise à jour automatique à partir du repo distant |
|
|
|
|
|
|
|
|
pushd > /dev/null |
|
|
pushd > /dev/null 2>&1 |
|
|
cd $RC_PATH |
|
|
cd $RC_PATH |
|
|
|
|
|
|
|
|
# In case the network is down, don't lock the terminal |
|
|
# In case the network is down, don't lock the terminal |
|
|
@ -37,12 +37,13 @@ elif $(echo "$git_st" | grep '^## .*behind' &> /dev/null); then |
|
|
echo "Type Y to update .zshrc: \c" |
|
|
echo "Type Y to update .zshrc: \c" |
|
|
read line |
|
|
read line |
|
|
if [ "$line" = Y ] || [ "$line" = y ]; then |
|
|
if [ "$line" = Y ] || [ "$line" = y ]; then |
|
|
git pull --rebase --stat origin master && source $HOME/.zshrc && popd > /dev/null |
|
|
git pull --rebase --stat origin master && source $HOME/.zshrc |
|
|
|
|
|
popd > /dev/null 2>&1 |
|
|
return |
|
|
return |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
popd > /dev/null |
|
|
popd > /dev/null 2>&1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Configuration for virtualenv |
|
|
# Configuration for virtualenv |
|
|
|