such fail :S

This commit is contained in:
Shoghi Cervantes 2014-01-29 19:11:47 +01:00
parent e7aea41f80
commit e799376559
2 changed files with 4 additions and 9 deletions

View File

@ -109,7 +109,6 @@ fi
rm -r -f install_data/ >> "$DIR/install.log" 2>&1
rm -r -f php5/ >> "$DIR/install.log" 2>&1
rm -r -f bin/ >> "$DIR/install.log" 2>&1
mkdir -m 0777 install_data >> "$DIR/install.log" 2>&1
mkdir -m 0777 php5 >> "$DIR/install.log" 2>&1
@ -234,8 +233,8 @@ if [ "$1" == "crosscompile" ]; then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no"
fi
./configure $OPTIMIZATION--prefix="$DIR/bin/php" \
--exec-prefix="$DIR/bin/php" \
./configure $OPTIMIZATION--prefix="$DIR/bin/php5" \
--exec-prefix="$DIR/bin/php5" \
--with-curl="$HAVE_CURL" \
--with-zlib="$DIR/install_data/php/ext/zlib" \
--with-zlib-dir="$DIR/install_data/php/ext/zlib" \
@ -280,10 +279,6 @@ echo " done!"
cd "$DIR"
echo -n "[INFO] Cleaning up..."
rm -r -f install_data/ >> "$DIR/install.log" 2>&1
mv php5/bin/php bin/php
mv php5/bin/phpize bin/phpize
mv php5/bin/php-config bin/php-config
rm -r -f php5/ >> "$DIR/install.log" 2>&1
date >> "$DIR/install.log" 2>&1
echo " done!"
echo "[PocketMine] You should start the server now using \"./start.sh.\""

View File

@ -1,8 +1,8 @@
#!/bin/bash
DIR="$(cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
cd "$DIR"
if [ -f ./bin/php/php ]; then
./bin/php/php -d enable_dl=On PocketMine-MP.php $@
if [ -f ./bin/php5/bin/php ]; then
./bin/php5/bin/php -d enable_dl=On PocketMine-MP.php $@
else
echo "[WARNING] You are not using the standalone PocketMine-MP PHP binary."
php -d enable_dl=On PocketMine-MP.php $@