diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-11-15 13:20:57 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-11-15 13:20:57 -0200 |
| commit | 7fe232d8e15ca72d03848451ae0cd6be71d62df1 (patch) | |
| tree | f3f0d0d6a828fc7edc255fed071063b37f164e7f /templates/drupal.sh.erb | |
| parent | 724a71ee1ccee4b48e9b936c1a0ba5dfdae69bcd (diff) | |
| download | puppet-drupal-7fe232d8e15ca72d03848451ae0cd6be71d62df1.tar.gz puppet-drupal-7fe232d8e15ca72d03848451ae0cd6be71d62df1.tar.bz2 | |
Using confirm instead of pipe
Diffstat (limited to 'templates/drupal.sh.erb')
| -rw-r--r-- | templates/drupal.sh.erb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 046c58c..04bce65 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -84,7 +84,8 @@ function drupal_iterate { fi if [ "$1" == "update" ] || [ "$1" == "cron-update" ]; then - drupal_update $1 $drupal + shift + drupal_update $1 $drupal $* else drush -l $drupal $* fi @@ -106,12 +107,12 @@ function drupal_iterate { function drupal_update { local method="$1" local instance="$2" - local pipe + local confirm local line shift 2 if [ "$method" == "cron-update" ]; then - pipe="--pipe" + confirm="-y" fi # See https://drupal.org/node/823146#comment-3319070 @@ -122,7 +123,7 @@ function drupal_update { if [ "$code" == "drupal" ]; then echo "Core update available: $line" else - drush -l $instance up -y -u 1 $pipe $* $code + drush -l $instance up -u 1 $confirm $* $code fi done } |