|
|
|
@ -13,7 +13,7 @@ |
|
|
|
export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:~/bin |
|
|
|
|
|
|
|
# Mise à jour automatique à partir du repo distant |
|
|
|
cd /home/$USER/rc |
|
|
|
cd $HOME/rc |
|
|
|
# In case the network is down, don't lock the terminal |
|
|
|
timeout 3 git fetch > /dev/null 2>&1 |
|
|
|
if [ "$?" -ge "124" ]; then |
|
|
|
@ -21,7 +21,7 @@ if [ "$?" -ge "124" ]; then |
|
|
|
fi |
|
|
|
git_st=$(command git status --porcelain -b 2> /dev/null) |
|
|
|
if $(echo "$git_st" | grep '^## .*ahead' &> /dev/null); then |
|
|
|
echo"You have unpushed business in /home/$USER/rc" |
|
|
|
echo "You have unpushed business in $HOME/rc" |
|
|
|
elif $(echo "$git_st" | grep '^## .*behind' &> /dev/null); then |
|
|
|
echo "Type Y to update .zshrc: \c" |
|
|
|
read line |
|
|
|
|