From 069d63172a55e1d1d7144ee3ae188528bfa3bb1d Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Thu, 24 Jul 2014 19:03:18 -0300
Subject: [PATCH] Fix source download

---
 .gitignore              |  2 ++
 .mrconfig               |  5 ++++-
 utils/downloadsource.sh | 48 +++++++++++++++++++++++++-----------------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85906de..dc9ce9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /doc
 /build
 /rpm/*.spec
+/src
+/solr
diff --git a/.mrconfig b/.mrconfig
index 144bfd9..2aedaaa 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,5 +1,8 @@
+[.]
+
 [solr]
-checkout = utils/downloadsource.sh http://archive.apache.org/dist/lucene/solr/4.6.1/solr-4.6.1.tgz solr http://archive.apache.org/dist/lucene/solr/4.6.1/solr-4.6.1.tgz.md5
+checkout = utils/downloadsource.sh http://archive.apache.org/dist/lucene/solr/4.6.1/solr-4.6.1.tgz solr 41bacb8f7033f1448cdf0f923e034a7f
+skip = true
 
 [colab]
 checkout = git clone https://github.com/colab-community/colab.git --branch stable_spb
diff --git a/utils/downloadsource.sh b/utils/downloadsource.sh
index cd7a514..d440cd1 100755
--- a/utils/downloadsource.sh
+++ b/utils/downloadsource.sh
@@ -1,39 +1,41 @@
-# !/bin/bash
-if [ $# -lt 3 ];
+# !/bin/sh
+
+set -eu
+
+if [ $# -ne 3 ];
 then
 	echo "Usage: $0 {link} {destdir} {md5sum}"
-	exit -1
+	exit 1
 fi
 
-link=$1
-dest=$2
-checksum=$3
-packdir=packages
+tarball=$1
+destdir=$2
+md5sum=$3
 
-fname=`basename $link`
-cname=`basename $checksum`
+srcdir=$(dirname $0)/../src
+mkdir -p $srcdir
 
-if [ ! -f $packdir/$fname ];
-then
-	wget $link -O $dest/$fname
-fi
+fname=`basename $tarball`
+md5sum_file=/tmp/${fname}.md5sum
+echo "$md5sum $fname" > $md5sum_file
 
-if [ ! -f $packdir/$cname ];
+trap cleanup INT TERM EXIT
+cleanup() {
+	rm -f $md5sum_file
+}
+
+if [ ! -f $srcdir/$fname ];
 then
-	wget $checksum -O $packdir/$cname
+	wget $tarball -O $srcdir/$fname
 fi
 
 
-cd $packdir
-
-if ! md5sum -c $cname;
+if ! (cd $srcdir && md5sum -c $md5sum_file);
 then
 	echo "$fname is corrupted!"
 	exit -2
 fi
 
-cd ..
-
-mkdir -p $dest
-tar vxzf $packdir/$fname -C $dest --strip-components=1
-
+rm -rf $destdir
+mkdir -p $destdir
+tar xaf $srcdir/$fname -C $destdir --strip-components=1
--
libgit2 0.21.2