Fail in library files that have whitespace after the dir

This commit is contained in:
Joe Ferguson 2014-10-01 17:51:56 -06:00
parent dc380d7a82
commit 401cfb2905
1 changed files with 9 additions and 5 deletions

View File

@ -154,11 +154,15 @@ for repoTag in "${repos[@]}"; do
tags=() tags=()
for line in "${repoTagLines[@]}"; do for line in "${repoTagLines[@]}"; do
tag="$(echo "$line" | awk -F ': +' '{ print $1 }')" tag="$(echo "$line" | awk -F ': +' '{ print $1 }')"
fullGitUrl="$(echo "$line" | awk -F ' +' '{ print $2 }')" repoDir="$(echo "$line" | awk -F ': +' '{ print $2 }')"
gitDir="$(echo "$line" | awk -F ' +' '{ print $3 }')"
gitUrl="${fullGitUrl%%@*}" gitUrl="${repoDir%%@*}"
gitRef="${fullGitUrl#*@}" commitDir="${repoDir#*@}"
gitRef="${commitDir%% *}"
gitDir="${commitDir#* }"
if [ "$gitDir" = "$commitDir" ]; then
gitDir=''
fi
gitRepo="${gitUrl#*://}" gitRepo="${gitUrl#*://}"
gitRepo="${gitRepo%/}" gitRepo="${gitRepo%/}"
@ -231,7 +235,7 @@ while [ "$#" -gt 0 ]; do
# TODO git tag # TODO git tag
if [ ! -d "$gitRepo/$gitDir" ]; then if [ ! -d "$gitRepo/$gitDir" ]; then
echo "- failed; invalid dir: $gitDir" echo "- failed; invalid dir: '$gitDir'"
didFail=1 didFail=1
continue continue
fi fi