diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-11-15 12:48:59 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-11-15 12:48:59 -0200 |
| commit | 724a71ee1ccee4b48e9b936c1a0ba5dfdae69bcd (patch) | |
| tree | 9f96079a5af6bc2fff5a37e0061a06642752b001 /templates/drupal.sh.erb | |
| parent | 6f3f9e8bb7de5b626648fceb29d044619c641d88 (diff) | |
| download | puppet-drupal-724a71ee1ccee4b48e9b936c1a0ba5dfdae69bcd.tar.gz puppet-drupal-724a71ee1ccee4b48e9b936c1a0ba5dfdae69bcd.tar.bz2 | |
Minor fixes
Diffstat (limited to 'templates/drupal.sh.erb')
| -rw-r--r-- | templates/drupal.sh.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 83a4fe8..046c58c 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -83,7 +83,7 @@ function drupal_iterate { echo "Processing $drupal..." fi - if [ "$1" == "update" ] && [ "$1" == "cron-update" ]; then + if [ "$1" == "update" ] || [ "$1" == "cron-update" ]; then drupal_update $1 $drupal else drush -l $drupal $* @@ -405,14 +405,14 @@ elif [ "$1" == "cron" ]; then elif [ "$1" == "cron-update" ]; then SILENT="yes" drupal_iterate pm-refresh &> /dev/null - drupal_iterate pm-update + drupal_iterate cron-update elif [ "$1" == "deploy" ]; then shift drupal_deploy $* elif [ "$1" == "update" ]; then shift drupal_iterate pm-refresh - drupal_iterate pm-update $* + drupal_iterate update $* # Update alone might not trigger updatedb in a farm for all instances. drupal_iterate updatedb $* |