From 70a3400c53ba294708cfc01e09d77ef87290fdc0 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@gmail.com>
Date: Sat, 28 Dec 2013 10:47:01 +0400
Subject: [PATCH] =?UTF-8?q?update-nutools=20met=20=C3=A0=20jour=20le=20d?=
 =?UTF-8?q?=C3=A9p=C3=B4t=20local=20si=20possible=20supprimer=20le=20r?=
 =?UTF-8?q?=C3=A9pertoire=20.git=20lors=20du=20d=C3=A9ploiement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .nutools-devel |  0
 lib/uinst/conf |  6 ++++++
 update-nutools | 36 +++++++++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 .nutools-devel

diff --git a/.nutools-devel b/.nutools-devel
new file mode 100644
index 0000000..e69de29
diff --git a/lib/uinst/conf b/lib/uinst/conf
index b07ebfb..68b79d9 100644
--- a/lib/uinst/conf
+++ b/lib/uinst/conf
@@ -4,6 +4,12 @@ source "$@" || exit 1
 source "$ULIBDIR/ulib" && urequire DEFAULTS uenv uenv_update || exit 1
 cd "$scriptdir/../.."
 
+# supprimer les fichiers de VCS
+rm -rf .git
+
+# supprimer le marqueur d'un répertoire non déployé
+rm -f .nutools-devel
+
 # supprimer fichiers de développement
 rm -rf pyulib/{build,devel,migrate,test}
 
diff --git a/update-nutools b/update-nutools
index c837c1c..3614b8a 100755
--- a/update-nutools
+++ b/update-nutools
@@ -34,21 +34,39 @@ NOTE: si une erreur se produit, utiliser l'adresse privée, e.g.
           NUTOOLS_REPO=$PRIV_REPO $0"
 fi
 
-if [ $# -ne 1 -o "$1" != --do-update ]; then
+scriptdir="$(dirname "$0")"
+if [ $# -ne 2 -o "$1" != --do-update ]; then
     cp "$0" "$TMPSCRIPT"
     chmod 755 "$TMPSCRIPT"
-    exec bash "$TMPSCRIPT" --do-update
+    exec bash "$TMPSCRIPT" --do-update "$scriptdir"
+fi
+
+scriptdir="$2"
+clonerepo=
+if [ -z "$NUTOOLS_UPDATE_REPO" -a -f "$scriptdir/.nutools-devel" -a -d "$scriptdir/.git" ]; then
+    echo "NOTE: tentative de mise à jour du dépôt local"
+    cd "$scriptdir"
+    git pull || clonerepo=1
+else
+    clonerepo=1
+fi
+
+if [ -n "$clonerepo" ]; then
+    echo "NOTE: clonage du dépôt distant $REPO"
+    cd /tmp
+    rm -rf "$NAME"
+    git clone "$REPO" || exit 1
+    cd "$NAME"
 fi
 
-cd /tmp
-rm -rf "$NAME"
-git clone "$REPO" || exit 1
-cd "$NAME"
 if ! diff -q "$SCRIPTNAME" "$0"; then
     echo "NOTE: Le script $SCRIPTNAME a été mis à jour. Il va être relancé."
     exec bash "./$SCRIPTNAME"
 fi
 bash ./uinst -y || exit 1
-cd ..
-rm -rf "$NAME"
-rm "$0"; exit 0
+
+if [ -n "$clonerepo" ]; then
+    cd ..
+    rm -rf "$NAME"
+fi
+rm "$0"; exit 0
\ No newline at end of file