Fix source download

Antonio Terceiro
1 parent 14d51296
Showing 3 changed files with 31 additions and 24 deletions Show diff stats
.gitignore
.mrconfig
utils/downloadsource.sh
@@ -4,3 +4,5 @@
 /doc
 /build
 /rpm/*.spec
+/src
+/solr
+[.]
+
 [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
-# !/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
...	...	@@ -4,3 +4,5 @@
4	4	/doc
5	5	/build
6	6	/rpm/*.spec
	7	+/src
	8	+/solr
...	...
	1	+[.]
	2	+
1	3	[solr]
2		-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
	4	+checkout = utils/downloadsource.sh http://archive.apache.org/dist/lucene/solr/4.6.1/solr-4.6.1.tgz solr 41bacb8f7033f1448cdf0f923e034a7f
	5	+skip = true
3	6
4	7	[colab]
5	8	checkout = git clone https://github.com/colab-community/colab.git --branch stable_spb
...	...
1		-# !/bin/bash
2		-if [ $# -lt 3 ];
	1	+# !/bin/sh
	2	+
	3	+set -eu
	4	+
	5	+if [ $# -ne 3 ];
3	6	then
4	7	echo "Usage: $0 {link} {destdir} {md5sum}"
5		- exit -1
	8	+ exit 1
6	9	fi
7	10
8		-link=$1
9		-dest=$2
10		-checksum=$3
11		-packdir=packages
	11	+tarball=$1
	12	+destdir=$2
	13	+md5sum=$3
12	14
13		-fname=`basename $link`
14		-cname=`basename $checksum`
	15	+srcdir=$(dirname $0)/../src
	16	+mkdir -p $srcdir
15	17
16		-if [ ! -f $packdir/$fname ];
17		-then
18		- wget $link -O $dest/$fname
19		-fi
	18	+fname=`basename $tarball`
	19	+md5sum_file=/tmp/${fname}.md5sum
	20	+echo "$md5sum $fname" > $md5sum_file
20	21
21		-if [ ! -f $packdir/$cname ];
	22	+trap cleanup INT TERM EXIT
	23	+cleanup() {
	24	+ rm -f $md5sum_file
	25	+}
	26	+
	27	+if [ ! -f $srcdir/$fname ];
22	28	then
23		- wget $checksum -O $packdir/$cname
	29	+ wget $tarball -O $srcdir/$fname
24	30	fi
25	31
26	32
27		-cd $packdir
28		-
29		-if ! md5sum -c $cname;
	33	+if ! (cd $srcdir && md5sum -c $md5sum_file);
30	34	then
31	35	echo "$fname is corrupted!"
32	36	exit -2
33	37	fi
34	38
35		-cd ..
36		-
37		-mkdir -p $dest
38		-tar vxzf $packdir/$fname -C $dest --strip-components=1
39		-
	39	+rm -rf $destdir
	40	+mkdir -p $destdir
	41	+tar xaf $srcdir/$fname -C $destdir --strip-components=1
...	...