diff --git a/src/build/compile.sh b/src/build/compile.sh index aa4d7273a..ee6d6c7c1 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -233,7 +233,7 @@ cd .. rm -r -f ./zlib echo " done!" -if [ "$2" == "openssl" ]; then +if [ "$2" == "openssl" ] || [ "$2" == "curl" ] && [ "$1" != "crosscompile" ]; then #OpenSSL WITH_SSL="--with-ssl=$DIR/bin/php5" WITH_OPENSSL="--with-openssl=$DIR/bin/php5" @@ -357,7 +357,7 @@ if which free >/dev/null; then else MAX_MEMORY=$(top -l 1 | grep PhysMem: | awk '{print $10}' | tr -d 'a-zA-Z') fi -if [ $MAX_MEMORY -gt 512 ] && [ "$1" != "crosscompile" ]; then +if [ $MAX_MEMORY -gt 512 2>> /dev/null ] && [ "$1" != "crosscompile" ]; then echo -n " enabling optimizations..." OPTIMIZATION="--enable-inline-optimization " else diff --git a/src/build/installer.sh b/src/build/installer.sh index b1844d413..c8068bf4c 100644 --- a/src/build/installer.sh +++ b/src/build/installer.sh @@ -84,7 +84,7 @@ else UNAME_M=$(uname -m) IS_IOS=$(expr match $UNAME_M 'iP[a-zA-Z0-9,]*') set -e - if [ $IS_IOS -gt 0 ]; then + if [ $IS_IOS -gt 0 2>> /dev/null ]; then rm -r -f bin/ >> /dev/null 2>&1 echo -n "[3/3] iOS PHP build available, downloading $IOS_BUILD.tar.gz..." download_file "http://sourceforge.net/projects/pocketmine/files/builds/$IOS_BUILD.tar.gz" | tar -zx > /dev/null 2>&1