From 2a2cfa168e1f74c9547f2067573f82e4a7b8c5a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Sep 2013 12:12:05 +0200
Subject: [PATCH] Try variabilisation of script

---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aaa71e536ed..6bd4bcb93fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,10 @@ before_script:
  - echo Home dir is `echo ~`
  - echo Create dir $(pwd)/htdocs/documents
  - mkdir -p $(pwd)/htdocs/documents/admin/temp;
- - touch /home/travis/build/Dolibarr/dolibarr/htdocs/documents/dolibarr.log;
- - chmod -R a+rwx /home/travis/build/Dolibarr/dolibarr/htdocs/documents;
- - find /home/travis/build/Dolibarr/dolibarr/htdocs/documents -exec ls -alrt {} \;
+ - touch $(pwd)/htdocs/documents/dolibarr.log;
+ - chmod a+rwx /home; chmod a+rwx /home/travis; chmod a+rwx /home/travis/build;
+ - chmod -R a+rwx $(pwd);
+ - find $(pwd)/htdocs/documents -exec ls -alrt {} \;
  - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
@@ -34,14 +35,14 @@ before_script:
  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < /home/travis/build/Dolibarr/dolibarr/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
  - echo Create config file htdocs/conf/conf.php
  - echo '<?php ' > htdocs/conf/conf.php
  - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then echo '$'dolibarr_main_db_type=\'mysqli\'';' >> htdocs/conf/conf.php; fi"
  - echo '$'dolibarr_main_url_root=\'http://localhost/\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_document_root=\'/home/travis/build/Dolibarr/dolibarr/htdocs\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_data_root=\'/home/travis/build/Dolibarr/dolibarr/htdocs/documents\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_document_root=\'$(pwd)/htdocs\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_data_root=\'$(pwd)/htdocs/documents\'';' >> htdocs/conf/conf.php
  - echo '$'dolibarr_main_db_host=\'localhost\'';' >> htdocs/conf/conf.php
  - echo '$'dolibarr_main_db_name=\'myapp_test\'';' >> htdocs/conf/conf.php
  - echo '$'dolibarr_main_db_user=\'travis\'';' >> htdocs/conf/conf.php
@@ -53,7 +54,6 @@ before_script:
  - sudo apt-get update > /dev/null
  - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
  - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
- - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
  - echo Show default virtual host
  - sudo cat /etc/apache2/sites-available/default
  - sudo /etc/init.d/apache2 restart
@@ -71,7 +71,7 @@ script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml
 
 after_script:
  - Output dolibarr log file
- - cat /home/travis/build/Dolibarr/dolibarr/htdocs/documents/dolibarr.log
+ - cat $(pwd)/htdocs/documents/dolibarr.log
  - Output apache log file
  - sudo cat /var/log/apache2/error.log
  - echo End travis