From f460399dd546325ab1ee8b14e52c681e78c7e472 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 13 Apr 2016 10:01:37 +0400 Subject: [PATCH] =?UTF-8?q?am=C3=A9liorer=20le=20calcul=20du=20r=C3=A9pert?= =?UTF-8?q?oire=20destination=20avec=20pclone/pcrone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uproject | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/uproject b/uproject index 3276c60..852a8e1 100755 --- a/uproject +++ b/uproject @@ -270,9 +270,13 @@ elif array_contains GITANNEX_CMDS "$CMD"; then elif [ "$CMD" == clone ]; then repourl="${1%.git}" [ -n "$repourl" ] || die "Vous devez spécifier l'url du dépôt git" + splitfsep "$repourl" : userhost path destdir="$2" - [ -n "$destdir" ] || setx destdir=basename -- "$repourl" + if [ -z "$destdir" ]; then + setx destdir=basename -- "$path" + destdir="${destdir%.git}" + fi [ -d "$destdir" ] && die "$(ppath "$destdir"): répertoire existant" use_ssh_wrapper @@ -282,12 +286,15 @@ elif [ "$CMD" == clone ]; then elif [ "$CMD" == crone ]; then repourl="${1%.git}" [ -n "$repourl" ] || die "Vous devez spécifier l'url du dépôt git" + splitfsep "$repourl" : userhost path destdir="$2" - [ -n "$destdir" ] || setx destdir=basename -- "$repourl" + if [ -z "$destdir" ]; then + setx destdir=basename -- "$path" + destdir="${destdir%.git}" + fi [ -d "$destdir" ] && die "$(ppath "$destdir"): répertoire existant" - splitfsep "$repourl" : userhost path splituserhost "$userhost" user host [ -n "$user" ] || user=git [ -n "$host" ] || die "Vous devez spécifier l'hôte"