@@ -48,6 +48,8 @@ Please follow any dialogs that appear regarding XCode and the Java JDK.
48
48
49
49
NOTICE
50
50
51
+ if [[ ` ulimit` -ne " unlimited" ]] || [[ ` sysctl -n kern.maxfilesperproc` -ne " 1048576" ]] || [[ ` sysctl -n kern.maxfiles` -ne " 1048600" ]]; then
52
+
51
53
read -p " $( echo -e ' \n\bWould you like to adjust the kernel parameters as needed? [y/n]\n\b' ) " -n 1
52
54
if [[ $REPLY =~ ^[Yy]$ ]]; then
53
55
echo " "
58
60
echo " "
59
61
echo " Continuing begrudgingly... you may run into problems."
60
62
fi
61
-
63
+ fi
62
64
# check for Xcode and command line tools or a third-party GCC/clang
63
65
if is_missing gcc || [[ ` gcc 2>&1 ` == * " xcode" * ]]; then
64
66
if [[ ! ` xcode-select -v` == " xcode-select version" * ]]; then
72
74
fi
73
75
fi
74
76
75
-
76
-
77
-
78
77
# TODO: do this on first run only...
79
78
if [[ $OS == " debian" ]]; then
80
79
sudo apt-get update -y
84
83
85
84
if is_missing wget ; then
86
85
if [[ $OS == " osx" ]]; then
87
- wget -N -c http://ftp.gnu.org/gnu/wget/wget-1.15.tar.gz
86
+ curl http://ftp.gnu.org/gnu/wget/wget-1.15.tar.gz | tar -xf- -C .
88
87
tar -xzvf wget-1.15.tar.gz
89
88
cd wget-1.15
90
89
./configure --with-ssl=openssl
272
271
# Python GDAL (the OSX package includes this)
273
272
if [[ $OS == ' debian' ]]; then
274
273
sudo apt-get -y install python-gdal
275
- elif [[ $OS == ' osx' ]] && [[ ` sw_vers ` == * " 10.9 " * ]] && [[ ! ` python -c ' import osgeo' ` == ' ' ]]; then
276
- # GDAL needs to be reinstalled on 10.9 if it was installed on a lower version of OSX
274
+ elif [[ $OS == ' osx' ]] && [[ ! ` python -c ' import osgeo' ` == ' ' ]]; then
275
+ # GDAL needs to be reinstalled when OSX is upgraded from a prior version (10.9 and 10.10 confirmed)
277
276
osx_install_gdal
278
277
elif [[ $OS == ' freebsd' ]]; then
279
278
pkg_add -r py27-gdal
0 commit comments