From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 15 Nov 2012 13:52:30 +0000 (-0200)
Subject: Minor fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e1cd9db36c52138a276f609f73b1cb009787044f;p=puppet-drupal.git

Minor fixes
---

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index ffe1aee..a48c655 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 $*
@@ -108,6 +108,7 @@ function drupal_update {
   local instance="$2"
   local pipe
   local line
+  shift 2
 
   if [ "$method" == "" ]; then
     pipe="--pipe"
@@ -121,7 +122,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 -y -u 1 $pipe $* $code
     fi
   done
 }