diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-dependencies.sh | 8 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index b60fae6..1ac864c 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -1,6 +1,5 @@ -# Determine which versions of dependency libraries and tools are -# available on the system. Compare these versions with the minimum parsed -# from README.md and print results. +# Parse the minimum versions of dependencies from README.md, and compare +# with what is found on the system. Print results. # # usage # check-dependencies.sh # check version of all dependencies @@ -23,7 +22,6 @@ # if /usr/ and /usr/local/ on linux both hit, throw an error # fallback- pkgconfig --exists, then --modversion # fallback2 - pkg manager -# todo - use OPENSCAD_LIBRARIES ??? # - print location found, how found??? # DEBUG= @@ -386,7 +384,7 @@ get_minversion_from_readme() READFILE=`dirname $0`/../README.md fi fi - if [ ! $READFILE ]; then echo "cannot find README.md"; exit; fi + if [ ! $READFILE ]; then echo "cannot find README.md"; exit 1; fi debug get_minversion_from_readme $* if [ ! $1 ]; then return; fi depname=$1 diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 804eaa5..0a16886 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -145,7 +145,7 @@ build_cgal() echo "Building CGAL" $version "..." cd $BASEDIR/src rm -rf CGAL-$version - if [ ! -f CGAL-$version.tar.gz ]; then + if [ ! -f CGAL-$version.tar.* ]; then #4.0.2 curl --insecure -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2 # 4.0 curl --insecure -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz |