diff --git a/apacheconfig b/apacheconfig index 857205b..2ec25dc 100755 --- a/apacheconfig +++ b/apacheconfig @@ -160,6 +160,12 @@ if [ "$nohideconfig" == auto ]; then [ -n "$FULLCONF" ] && nohideconfig= || nohideconfig=1 fi +if [ -n "$pull" ]; then + estep "Mise à jour du dépôt" + [ -d "$destdir" ] || die "$destdir: répertoire introuvable" + (cd "$destdir" && git pull) || die +fi + apacheconfig_loadconf "$destdir" "$nohideconfig" || die apacheconfig_sysinfos "$sysname" "$sysdist" "$sysver" "$bits" @@ -197,11 +203,6 @@ $__TEMPLATECTL_HELP" elif [ "$action" == deploy -o "$action" == localhosts ]; then [ -d "$destdir" ] || die "$destdir: répertoire introuvable" - if [ -n "$pull" ]; then - estep "Mise à jour du dépôt" - (cd "$destdir" && git pull) || die - fi - args=( -d "$destdir" --$action ${fixip:+--fix-ip}