From 4a4c28cd8ccab18807303fdcea8f180a56ebb81a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 3 Feb 2020 09:30:43 +0000 Subject: [PATCH] travis.sh: ditch PHP_BINARY variable, use PATH prefix instead this is how normal people do it ... --- tests/travis.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/travis.sh b/tests/travis.sh index a4d0e744b..3259be303 100755 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -1,13 +1,9 @@ #!/bin/bash -PHP_BINARY="php" PM_WORKERS="auto" -while getopts "p:t:" OPTION 2> /dev/null; do +while getopts "t:" OPTION 2> /dev/null; do case ${OPTION} in - p) - PHP_BINARY="$OPTARG" - ;; t) PM_WORKERS="$OPTARG" ;; @@ -22,10 +18,10 @@ rm -rf "$DATA_DIR" rm PocketMine-MP.phar 2> /dev/null cd tests/plugins/PocketMine-DevTools -"$PHP_BINARY" -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar +php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar cd ../../.. -"$PHP_BINARY" -dphar.readonly=0 ./build/server-phar.php ./PocketMine-MP.phar +php -dphar.readonly=0 ./build/server-phar.php ./PocketMine-MP.phar if [ -f PocketMine-MP.phar ]; then echo Server phar created successfully. else @@ -37,7 +33,7 @@ mkdir "$DATA_DIR" mkdir "$PLUGINS_DIR" mv DevTools.phar "$PLUGINS_DIR" cp -r tests/plugins/TesterPlugin "$PLUGINS_DIR" -echo -e "stop\n" | "$PHP_BINARY" PocketMine-MP.phar --no-wizard --disable-ansi --disable-readline --debug.level=2 --data="$DATA_DIR" --plugins="$PLUGINS_DIR" --anonymous-statistics.enabled=0 --settings.async-workers="$PM_WORKERS" --settings.enable-dev-builds=1 +echo -e "stop\n" | php PocketMine-MP.phar --no-wizard --disable-ansi --disable-readline --debug.level=2 --data="$DATA_DIR" --plugins="$PLUGINS_DIR" --anonymous-statistics.enabled=0 --settings.async-workers="$PM_WORKERS" --settings.enable-dev-builds=1 output=$(grep '\[TesterPlugin\]' "$DATA_DIR/server.log") if [ "$output" == "" ]; then