Support vendoring to subdirectories of vendor

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

pull

@@ -50,14 +50,16 @@ vendor() {
   rm -rf "$4/$1/.gitmodules"
   rm -rf "$4/$1/.gitattributes"
 
+  OUTPUT="$VENDOR/$1"
+
   # Masking
-  if [ -f "$VENDOR/$1.mask" ]
+  if [ -f "$OUTPUT.mask" ]
   then
     while read -r path
     do
       log "Masking $1: $path"
       rm -rf "$4/$1/${path:?}"
-    done < "$VENDOR/$1.mask"
+    done < "$OUTPUT.mask"
   elif [ -f "$4/$1/vendorpull.mask" ]
   then
     while read -r path
@@ -69,10 +71,10 @@ vendor() {
   fi
 
   # Swap
-  log "Moving $4/$1 to $VENDOR/$1"
-  rm -rf "$VENDOR/${1:?}"
-  mkdir -p "$VENDOR"
-  mv "$4/$1" "$VENDOR/$1"
+  log "Moving $4/$1 to $OUTPUT"
+  rm -rf "$OUTPUT"
+  mkdir -p "$(dirname "$OUTPUT")"
+  mv "$4/$1" "$OUTPUT"
 }
 
 if [ ! -f "$DEPENDENCIES" ]