Skip to content

Commit 24f493b

Browse files
committed
Update installer for OSX
1 parent de8addd commit 24f493b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

install.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Please follow any dialogs that appear regarding XCode and the Java JDK.
4848
4949
NOTICE
5050

51+
if [[ `ulimit` -ne "unlimited" ]] || [[ `sysctl -n kern.maxfilesperproc` -ne "1048576" ]] || [[ `sysctl -n kern.maxfiles` -ne "1048600" ]]; then
52+
5153
read -p "$(echo -e '\n\bWould you like to adjust the kernel parameters as needed? [y/n]\n\b')" -n 1
5254
if [[ $REPLY =~ ^[Yy]$ ]]; then
5355
echo ""
@@ -58,7 +60,7 @@ NOTICE
5860
echo ""
5961
echo "Continuing begrudgingly... you may run into problems."
6062
fi
61-
63+
fi
6264
#check for Xcode and command line tools or a third-party GCC/clang
6365
if is_missing gcc || [[ `gcc 2>&1` == *"xcode"* ]]; then
6466
if [[ ! `xcode-select -v` == "xcode-select version"* ]]; then
@@ -72,9 +74,6 @@ NOTICE
7274
fi
7375
fi
7476

75-
76-
77-
7877
#TODO: do this on first run only...
7978
if [[ $OS == "debian" ]]; then
8079
sudo apt-get update -y
@@ -84,7 +83,7 @@ fi
8483

8584
if is_missing wget ; then
8685
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 .
8887
tar -xzvf wget-1.15.tar.gz
8988
cd wget-1.15
9089
./configure --with-ssl=openssl
@@ -272,8 +271,8 @@ fi
272271
#Python GDAL (the OSX package includes this)
273272
if [[ $OS == 'debian' ]]; then
274273
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)
277276
osx_install_gdal
278277
elif [[ $OS == 'freebsd' ]]; then
279278
pkg_add -r py27-gdal

0 commit comments

Comments
 (0)