diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-04 10:51:34 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-04 10:51:34 +0100 |
commit | 790d8575214e254c1923aa40095171405dbba321 (patch) | |
tree | 5102e1fa04dbbb22f7865881679cff69f1574dd1 | |
parent | ea200e8d7eb380213b32c3081dd87396736f9533 (diff) |
Now we use bundler, update all scripts to exec `rake` as `bundle exec rake`
-rwxr-xr-x | script/generate_pot.sh | 4 | ||||
-rwxr-xr-x | script/load-sample-data | 2 | ||||
-rwxr-xr-x | script/rails-post-deploy | 2 | ||||
-rwxr-xr-x | script/rebuild-xapian-index | 2 | ||||
-rwxr-xr-x | script/spec-all-pairs | 2 | ||||
-rwxr-xr-x | script/test-run | 2 | ||||
-rwxr-xr-x | script/update-xapian-index | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/script/generate_pot.sh b/script/generate_pot.sh index f6c82dda7..c0540c3d9 100755 --- a/script/generate_pot.sh +++ b/script/generate_pot.sh @@ -10,8 +10,8 @@ git status | grep app.po | awk '{print $3}' | xargs git add git commit -m "Backup latest po files from Transifex" # now regenerate POT and PO files from Alaveteli source -rake gettext:store_model_attributes -rake gettext:findpot +bundle exec rake gettext:store_model_attributes +bundle exec rake gettext:findpot # upload the result to Transifex tx push -t diff --git a/script/load-sample-data b/script/load-sample-data index e5f1be4cd..86e1af128 100755 --- a/script/load-sample-data +++ b/script/load-sample-data @@ -6,7 +6,7 @@ LOC=`dirname "$0"` -rake --silent spec:db:fixtures:load +bundle exec rake --silent spec:db:fixtures:load "$LOC/runner" /dev/stdin <<END env = ENV["RAILS_ENV"] diff --git a/script/rails-post-deploy b/script/rails-post-deploy index 6e2c88d28..4edabc9a7 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -87,6 +87,6 @@ then fi # upgrade database -rake db:migrate #--trace +bundle exec rake db:migrate #--trace diff --git a/script/rebuild-xapian-index b/script/rebuild-xapian-index index 5986f5259..3012511de 100755 --- a/script/rebuild-xapian-index +++ b/script/rebuild-xapian-index @@ -1,4 +1,4 @@ #!/bin/bash cd `dirname $0` -rake --silent "$@" xapian:rebuild_index models="PublicBody User InfoRequestEvent" +bundle exec rake --silent "$@" xapian:rebuild_index models="PublicBody User InfoRequestEvent" diff --git a/script/spec-all-pairs b/script/spec-all-pairs index 5b6439a4e..6d7bb17c4 100755 --- a/script/spec-all-pairs +++ b/script/spec-all-pairs @@ -6,7 +6,7 @@ log_file=/dev/null test_pair () { - rake db:test:prepare > /dev/null 2>&1 + bundle exec rake db:test:prepare > /dev/null 2>&1 output=$(script/spec "$1" "$2" 2>&1) if [ $? -eq 0 ] then diff --git a/script/test-run b/script/test-run index 4c7a0e3ec..7810b57d5 100755 --- a/script/test-run +++ b/script/test-run @@ -1,5 +1,5 @@ #!/bin/bash cd ../ -rake spec +bundle exec rake spec diff --git a/script/update-xapian-index b/script/update-xapian-index index 6ece02de0..e365e2fec 100755 --- a/script/update-xapian-index +++ b/script/update-xapian-index @@ -1,5 +1,5 @@ #!/bin/bash cd `dirname $0` -rake --silent xapian:update_index "$@" +bundle exec rake --silent xapian:update_index "$@" |