From 21dc2e7a00c14795fa6fbf5e96da74d4cf04f6f7 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Fri, 3 Dec 2021 18:42:46 +0000
Subject: [PATCH] Update git take command

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 home/.dotfiles/aliases | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/home/.dotfiles/aliases b/home/.dotfiles/aliases
index cc96310..6119c42 100644
--- a/home/.dotfiles/aliases
+++ b/home/.dotfiles/aliases
@@ -45,8 +45,19 @@ lt() {
 
 git() {
   if [ "$1" = "take" ]; then # Git clone then cd into new directory
-    _git clone $2
-    cd $(basename -s .git $2)
+    if [ $# -gt 2 ]; then
+      _git clone ${@:2}
+      cd $3
+    else
+      ORG=$(echo $2 | sed -e 's|https://||' -e 's|/| |g' -e 's|:| |g' | cut -f 2 -d ' ')
+      REPO=$(echo $2 | sed -e 's|https://||' -e 's|/| |g' -e 's|:| |g' | cut -f 3 -d ' ' | xargs basename -s .git)
+
+      DST="${HOME}/Code/${ORG}/${REPO}"
+      mkdir -p ${DST}
+
+      _git clone $2 ${DST}
+      cd ${DST}
+    fi
   elif [ "$1" = "commit" ]; then # Sign all commits
     shift
     _git commit -s $@