From c8935f04d40a8aa5769e2357b738826c2b27ecc6 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Thu, 13 Feb 2014 00:27:05 +0000 Subject: [PATCH 1/9] Try to get drush with composer, instead of pear. --- tests/scripts/travis_setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 3a52bb75..ccd3af50 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -15,13 +15,11 @@ cd $HOME pear upgrade --force Console_Getopt pear upgrade --force pear pear upgrade-all -pear channel-discover pear.drush.org -pear channel-discover pear.drush.org pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -pear install drush/drush-5.9.0 +composer global require drush/drush:5.9.0 phpenv rehash drush dl --yes drupal cd drupal-* From c7529e2295cfd6bca0954ac075cbd90e9a6b6f82 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Thu, 13 Feb 2014 00:32:54 +0000 Subject: [PATCH 2/9] Apparently, the drush devs have killed off 5.9.0... No 5.x branches listed on https://packagist.org/packages/drush/drush... --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index ccd3af50..2b0c0500 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,7 +19,7 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -composer global require drush/drush:5.9.0 +composer global require drush/drush:6.x phpenv rehash drush dl --yes drupal cd drupal-* From ef8bbaa9136008820034b20b5516f6536eceb657 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 12 Feb 2014 21:43:34 -0400 Subject: [PATCH 3/9] Make sure global composer stuff gets into PATH. --- tests/scripts/travis_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 2b0c0500..e5a4bee7 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,6 +19,7 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd +export PATH="$HOME/.composer/vendor/bin:$PATH" composer global require drush/drush:6.x phpenv rehash drush dl --yes drupal From 072ee836d063898ca8c468c082fe8b0a816f28fa Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 12 Feb 2014 21:50:47 -0400 Subject: [PATCH 4/9] Attempt #2 at getting drush properly into the PATH. --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index e5a4bee7..a57f53b9 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,7 +19,7 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -export PATH="$HOME/.composer/vendor/bin:$PATH" +sed -i '1i export PATH="$HOME/.composer/vendor/bin:$PATH"' $HOME/.bashrc composer global require drush/drush:6.x phpenv rehash drush dl --yes drupal From e9818a41d667cdbda65b20d42818ccbf768b2644 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 12 Feb 2014 21:53:40 -0400 Subject: [PATCH 5/9] Still need the PATH in the current env... --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index a57f53b9..104b5c0d 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,7 +19,7 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -sed -i '1i export PATH="$HOME/.composer/vendor/bin:$PATH"' $HOME/.bashrc +export PATH="$HOME/.composer/vendor/bin:$PATH" && sed -i '1i export PATH="$HOME/.composer/vendor/bin:$PATH"' $HOME/.bashrc composer global require drush/drush:6.x phpenv rehash drush dl --yes drupal From 9ae5d48fee5c24d1f64936247d2f4b5e94f717f6 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 12 Feb 2014 22:16:06 -0400 Subject: [PATCH 6/9] YAA --- tests/scripts/travis_setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 104b5c0d..8ccf1ab8 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,8 +19,9 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -export PATH="$HOME/.composer/vendor/bin:$PATH" && sed -i '1i export PATH="$HOME/.composer/vendor/bin:$PATH"' $HOME/.bashrc -composer global require drush/drush:6.x +export PATH="$HOME/.composer/vendor/bin:$PATH" +echo 'export PATH="$HOME/.composer/vendor/bin:$PATH"' >> $HOME/.bashrc +composer global require --prefer-source drush/drush:6.x phpenv rehash drush dl --yes drupal cd drupal-* From 0e62e8bef080a636fb481f8ec776bc67286c25ec Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 12 Feb 2014 22:43:00 -0400 Subject: [PATCH 7/9] Yeah, still won't work. Just trying something. --- tests/scripts/travis_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 8ccf1ab8..4b44b93b 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -1,5 +1,6 @@ #!/bin/bash +echo $PATH mysql -u root -e 'create database drupal;' mysql -u root -e "create database fedora;" mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENTIFIED BY 'fedora';" From 6fbf8d46a4b1034302ba2f8ef6f23371c75a9207 Mon Sep 17 00:00:00 2001 From: adam-vessey Date: Wed, 12 Feb 2014 22:51:03 -0400 Subject: [PATCH 8/9] Another attempt with a different approach. ... Try to add a symlink to somewhere already on the PATH, hurray! --- tests/scripts/travis_setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 4b44b93b..d8801d45 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -1,6 +1,5 @@ #!/bin/bash -echo $PATH mysql -u root -e 'create database drupal;' mysql -u root -e "create database fedora;" mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENTIFIED BY 'fedora';" @@ -20,8 +19,7 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -export PATH="$HOME/.composer/vendor/bin:$PATH" -echo 'export PATH="$HOME/.composer/vendor/bin:$PATH"' >> $HOME/.bashrc +sudo ln -s $HOME/.composer/vendor/bin/drush /usr/local/sbin composer global require --prefer-source drush/drush:6.x phpenv rehash drush dl --yes drupal From 930f4a02b5deb586369f6c5848b8788eff334610 Mon Sep 17 00:00:00 2001 From: adam-vessey Date: Wed, 12 Feb 2014 23:02:30 -0400 Subject: [PATCH 9/9] Just moving the link creation... ... having after it gets what it points to make more sense, yeah? --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index d8801d45..13a8e798 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -19,8 +19,8 @@ pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net pear install pear/PHP_CodeSniffer-1.4.8 pear install pear.phpunit.de/phpcpd -sudo ln -s $HOME/.composer/vendor/bin/drush /usr/local/sbin composer global require --prefer-source drush/drush:6.x +sudo ln -s $HOME/.composer/vendor/bin/drush /usr/local/sbin phpenv rehash drush dl --yes drupal cd drupal-*