aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-11-15 11:52:30 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-11-15 11:52:30 -0200
commite1cd9db36c52138a276f609f73b1cb009787044f (patch)
tree84a64b6644553ddaad1f35a66477f1ebdc67cf9c
parent26526c5f7abd17eebe40c6fcc4dfd03602a5d5ad (diff)
downloadpuppet-drupal-e1cd9db36c52138a276f609f73b1cb009787044f.tar.gz
puppet-drupal-e1cd9db36c52138a276f609f73b1cb009787044f.tar.bz2
Minor fixes
-rw-r--r--templates/drupal.sh.erb5
1 files changed, 3 insertions, 2 deletions
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
}