ci: use composer to determine bin directories

Author: Mateu Aguiló Bosch

scripts/ci/travis/tests/contenta_ci_tests_helper.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+COMPOSER_BIN_DIR="$(composer config bin-dir)"
+DOCROOT="web"
+
 # Setup Anonymous User Function
 # Gives access to anonymous user to access protected resources.
 # This function receives one argument:
@@ -12,14 +15,14 @@ setup_anonymous_user() {
 
     # Setup local variables
     current_path=`pwd`
-    drush=$1/bin/drush
-    drupal_base=$1/web
+    DRUSH=$1/$COMPOSER_BIN_DIR/drush
+    DRUPAL_BASE=$1/$DOCROOT
 
-    cd $drupal_base
+    cd $DRUPAL_BASE
     # Add Permission to anonymous user
-    $drush role-add-perm 'anonymous'  'access jsonapi resource list' -y
-    $drush updatedb -y
-    $drush cr -y
+    $DRUSH role-add-perm 'anonymous' 'access jsonapi resource list' -y
+    $DRUSH updatedb -y
+    $DRUSH cr -y
 
     cd $current_path
 }
@@ -40,13 +43,13 @@ run_functional_tests() {
     fi
 
     current_path=`pwd`
-    CONTENTA_PATH=$1/web/profiles/contrib/contenta_jsonapi/
-    PHPUNIT=$1/bin/phpunit
+    CONTENTA_PATH=$1/$DOCROOT/profiles/contrib/contenta_jsonapi/
+    PHPUNIT=$1/$COMPOSER_BIN_DIR/phpunit
 
     cd $CONTENTA_PATH
 
     WEB_HOST=$WEB_HOST WEB_PORT=$WEB_PORT $PHPUNIT --testsuite ContentaFunctional
     exit $?
 }
 
-$@
+$@

scripts/development/build-contenta_jsonapi.sh

@@ -3,6 +3,7 @@
 BASE_DIR="$(dirname $(dirname $(cd ${0%/*} && pwd)))"
 
 COMPOSER="$(which composer)"
+COMPOSER_BIN_DIR="$(composer config bin-dir)"
 DOCROOT="web"
 
 # Define the color scheme.
@@ -21,7 +22,7 @@ else
   echo -e "${FG_C}${WBG_C} WARNING ${NO_C} No installation path provided.\nContenta will be installed in $DEST_DIR."
   echo -e "${FG_C}${BG_C} USAGE ${NO_C} ${0} [install_path] # to install in a different directory."
 fi
-DRUSH="$DEST_DIR/vendor/bin/drush"
+DRUSH="$DEST_DIR/$COMPOSER_BIN_DIR/drush"
 
 echo -e "\n\n\n"
 echo -e "\t********************************"