2
0

Fix git-svn/git checkouts of dependencies.

This commit is contained in:
Maarten Billemont 2014-10-18 17:13:01 -04:00
parent b810c1032b
commit 68b9b4e09a

View File

@ -42,14 +42,14 @@ fetchSource() (
if [[ $git ]] && hash git 2>/dev/null; then if [[ $git ]] && hash git 2>/dev/null; then
echo echo
echo "Fetching: ${PWD##*/}, using git..." echo "Fetching: ${PWD##*/}, using git..."
git-svn clone --prefix=origin/ --stdlayout "$svn" . git clone "$svn" .
printf '%s' "$(git describe --always)" > "${PWD##*/}-version" printf '%s' "$(git describe --always)" > "${PWD##*/}-version"
return return
elif [[ $svn ]] && hash git-svn 2>/dev/null; then elif [[ $svn ]] && hash git 2>/dev/null && hash "$(git --exec-path)/git-svn" 2>/dev/null; then
echo echo
echo "Fetching: ${PWD##*/}, using git-svn..." echo "Fetching: ${PWD##*/}, using git-svn..."
git-svn clone --prefix=origin/ --stdlayout "$svn" . git svn clone --prefix=origin/ --stdlayout "$svn" .
printf '%s' "$(git describe --always)" > "${PWD##*/}-version" printf '%s' "$(git describe --always)" > "${PWD##*/}-version"
return return