[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in download.in

[Fridrich Strba]

 configure.in |    2 +-
 download.in  |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e6aae074ab283bf1f4c84f0f3f80fd27bebb6dce
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 27 15:27:52 2011 +0100

    Make ./download work with the git over http too
    
    signoff: kendy

diff --git a/configure.in b/configure.in
index f74697f..ecba74d 100755
--- a/configure.in
+++ b/configure.in
@@ -1624,7 +1624,7 @@ else
     if test -n "$with_git" -a "$with_git" != "yes" ; then
         OOO_GIT="$with_git"
     else
-        guess=`git config remote.origin.url | sed 's#/build$##'`
+        guess=`git config remote.origin.url | sed 's#/build$##' | sed 's#/build\.git$##'`
         if test -n "$guess" ; then
             OOO_GIT="$guess"
         fi
diff --git a/download.in b/download.in
index 4a3fe50..e6c93fb 100755
--- a/download.in
+++ b/download.in
@@ -279,6 +279,9 @@ sub source_file_ooo($)
 			if ( -d '@OOO_GIT@' . "/$what" ) {
 				print "* git-new-workdir from " . '@OOO_GIT@' . "/$what\n";
 				system( "cd @CLONEDIR@ ; @TOOLSDIR@/bin/git-new-workdir " . '@OOO_GIT@' . "/$what " . '@CLONEDIR@' . "/$what" ) && exit 1;
+			} elsif ( substr('@OOO_GIT@', 0, 4) == 'http' ) {
+				print "* cloning from " . '@OOO_GIT@' . "/$what" . ".git\n";
+				system( "cd @CLONEDIR@ ; git clone " . '@OOO_GIT@' . "/$what" . ".git " ) && exit 1;
 			} else {
 				print "* cloning from " . '@OOO_GIT@' . "/$what\n";
 				system( "cd @CLONEDIR@ ; git clone " . '@OOO_GIT@' . "/$what " ) && exit 1;