Download as
Browse Code »

Commit 069d63172a55e1d1d7144ee3ae188528bfa3bb1d

Authored by Antonio Terceiro
1 parent 14d51296
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Fix source download

Showing 3 changed files with 31 additions and 24 deletions   Show diff stats
@@ -4,3 +4,5 @@ @@ -4,3 +4,5 @@
4 /doc 4 /doc
5 /build 5 /build
6 /rpm/*.spec 6 /rpm/*.spec
  7 +/src
  8 +/solr
  1 +[.]
  2 +
1 [solr] 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 [colab] 7 [colab]
5 checkout = git clone https://github.com/colab-community/colab.git --branch stable_spb 8 checkout = git clone https://github.com/colab-community/colab.git --branch stable_spb
utils/downloadsource.sh
  Diff comments   View file @069d631
1 -# !/bin/bash  
2 -if [ $# -lt 3 ]; 1 +# !/bin/sh
  2 +
  3 +set -eu
  4 +
  5 +if [ $# -ne 3 ];
3 then 6 then
4 echo "Usage: $0 {link} {destdir} {md5sum}" 7 echo "Usage: $0 {link} {destdir} {md5sum}"
5 - exit -1 8 + exit 1
6 fi 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 then 28 then
23 - wget $checksum -O $packdir/$cname 29 + wget $tarball -O $srcdir/$fname
24 fi 30 fi
25 31
26 32
27 -cd $packdir  
28 -  
29 -if ! md5sum -c $cname; 33 +if ! (cd $srcdir && md5sum -c $md5sum_file);
30 then 34 then
31 echo "$fname is corrupted!" 35 echo "$fname is corrupted!"
32 exit -2 36 exit -2
33 fi 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