diff --git a/compile_php.sh b/compile_php.sh index 95a31a314..296333776 100644 --- a/compile_php.sh +++ b/compile_php.sh @@ -23,8 +23,10 @@ type wget >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"wge 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 +mkdir -m 0777 bin >> "$DIR/install.log" 2>&1 cd install_data set -e @@ -130,6 +132,8 @@ 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 +rm -r -f php/ >> "$DIR/install.log" 2>&1 date >> "$DIR/install.log" 2>&1 echo " done!" echo "[PocketMine] You should start the server now using \"./start.sh\"" diff --git a/start.sh b/start.sh index fe9838793..0f90735d4 100644 --- a/start.sh +++ b/start.sh @@ -1,8 +1,13 @@ #!/bin/bash DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$DIR" -if [ -f php5/bin/php ]; then -./php5/bin/php -d enable_dl=On PocketMine-MP.php $@ +if [ -f ./php5/bin/php ]; then +mkdir -m 0777 bin/ +mv ./php5/bin/php ./bin/php +rm -r -f ./php5/ +fi +if [ -f ./bin/php ]; then +./bin/php -d enable_dl=On PocketMine-MP.php $@ read -p "Press [Enter] to continue..." exit 0 fi