From 470d7cfe412748e3cd1f3fbb10b52d1bdc19030d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Thu, 2 Jun 2016 17:52:33 +0400 Subject: [PATCH] =?UTF-8?q?pcrone=20peut=20utiliser=20un=20r=C3=A9pertoire?= =?UTF-8?q?=20existant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uproject | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/uproject b/uproject index 852a8e1..0329547 100755 --- a/uproject +++ b/uproject @@ -293,7 +293,11 @@ elif [ "$CMD" == crone ]; then setx destdir=basename -- "$path" destdir="${destdir%.git}" fi - [ -d "$destdir" ] && die "$(ppath "$destdir"): répertoire existant" + tmpdestdir= + if [ -d "$destdir" ]; then + [ -d "$destdir/.git" ] && die "$(ppath "$destdir"): répertoire existant" + ac_set_tmpdir tmpdestdir + fi splituserhost "$userhost" user host [ -n "$user" ] || user=git @@ -303,7 +307,14 @@ elif [ "$CMD" == crone ]; then use_ssh_wrapper ssh "$userhost" create "$path" || die - git clone "$userhost:$path" "$destdir" || die + if [ -n "$tmpdestdir" ]; then + setxx destname=abspath "$destdir" // basename + git clone "$userhost:$path" "$tmpdestdir/$destname" || die + mv "$tmpdestdir/$destname/.git" "$destdir" || die + ac_clean "$tmpdestdir" + else + git clone "$userhost:$path" "$destdir" || die + fi git_annex_initial "$destdir" || die elif [ "$CMD" == xconfig-export ]; then