Minor fixes

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 83a4fe806a41f659b882cef27c0403c53583c083..046c58ca9ba1585af2e69e1f378f812f31209152 100644 (file)
--- 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 $*