Shell script fixes

Author: iMattPro

.travis.yml

@@ -46,7 +46,7 @@ branches:
     - /^\d+(\.\d+)?\.x$/
 
 install:
-  - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - travis/prepare-phpbb.sh $PHPBB_BRANCH
   - cd ../../phpBB3
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS

travis/prepare-epv.sh

@@ -14,7 +14,7 @@ set -x
 EPV=$1
 NOTESTS=$2
 
-if [ "$EPV" == "1" -a "$NOTESTS" == "1" ]
+if [ "$EPV" == "1" ] && [ "$NOTESTS" == "1" ]
 then
 	cd phpBB
 	composer remove sami/sami --update-with-dependencies --dev --no-interaction

travis/prepare-phpbb.sh

@@ -11,14 +11,12 @@
 set -e
 set -x
 
-EXTNAME=$1
-BRANCH=$2
-EXTPATH_TEMP=$3
+BRANCH=$1
 
 # Copy extension to a temp folder
 mkdir ../../tmp
 cp -R . ../../tmp
 cd ../../
 
 # Clone phpBB
-git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch=$BRANCH
+git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch="$BRANCH"