diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
| commit | 6d91540e4cc3f9fe0caaea63ac64518a5626d28b (patch) | |
| tree | ca7034453a1f55124e4b7378aaab22985aff6a21 /scripts/uni-build-dependencies.sh | |
| parent | 95947a877b8e88521a7f00348d56c89e9b7c2a79 (diff) | |
| parent | 6c7d386a3338039416ced323bf1aa75edbb43d19 (diff) | |
Merge branch 'master' into epec-kernel
Diffstat (limited to 'scripts/uni-build-dependencies.sh')
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 60dbb74..6596c8a 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -290,11 +290,26 @@ build_cgal() ver3_7="curl --insecure -O https://gforge.inria.fr/frs/download.php/27641/CGAL-3.7.tar.gz" vernull="echo already downloaded..skipping" download_cmd=ver`echo $version | sed s/"\."/"_"/` - if [ -e CGAL-$version.tar.gz ]; then download_cmd=vernull; fi - if [ -e CGAL-$version.tar.bz2 ]; then download_cmd=vernull; fi + + if [ -e CGAL-$version.tar.gz ]; then + download_cmd=vernull; + fi + if [ -e CGAL-$version.tar.bz2 ]; then + download_cmd=vernull; + fi + `eval echo "$"$download_cmd` - if [ -e CGAL-$version.tar.gz ]; then tar xf CGAL-$version.tar.gz; fi - if [ -e CGAL-$version.tar.bz2 ]; then tar xf CGAL-$version.tar.bz2; fi + + zipper=gzip + suffix=gz + if [ -e CGAL-$version.tar.bz2 ]; then + zipper=bzip2 + suffix=bz2 + fi + + $zipper -f -d CGAL-$version.tar.$suffix; + tar xf CGAL-$version.tar + cd CGAL-$version # older cmakes have buggy FindBoost that can result in |