[Libreoffice-commits] .: configure.in download.in

[Fridrich Strba]

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

New commits:
commit 5ef6d507bb044ab464b90139237eed1dc1ffcba7
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 9725c09..8a92c81 100755
--- a/configure.in
+++ b/configure.in
@@ -1713,7 +1713,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 5f08fa6..48f524d 100755
--- a/download.in
+++ b/download.in
@@ -291,6 +291,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;