diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-29 18:51:52 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-29 18:51:52 -0200 |
| commit | f1d293755a584c919a1b0d3fee206ebcd4ca4cf9 (patch) | |
| tree | 4e67313df589f9223764732c9055aab53dcb6aaf /templates | |
| parent | 9948634b6d990d3e8879095fc9cbac17be4063fc (diff) | |
| download | puppet-drupal-f1d293755a584c919a1b0d3fee206ebcd4ca4cf9.tar.gz puppet-drupal-f1d293755a584c919a1b0d3fee206ebcd4ca4cf9.tar.bz2 | |
Template fix (2)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/drupal.sh.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 6cd1994..5536069 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -72,7 +72,7 @@ function drupal_upgrade { fi # Set drupal series - if [ "$new_MAJOR" == "4" ]; then + if [ "$new_major" == "4" ]; then # Get minor versions new_minor="`echo $new | sed -e "s/^$new_major\.//"`" old_minor="`echo $old | sed -e "s/^$old_major\.//"`" @@ -81,9 +81,9 @@ function drupal_upgrade { echo "Minor versions doesn't match" exit 1 fi - drupal_series="$new_MAJOR.$MINOR" + drupal_series="$new_major.$new_minor" else - drupal_series="$new_MAJOR" + drupal_series="$new_major" fi cd $BASE @@ -100,7 +100,7 @@ function drupal_upgrade { done # Legacy stuff for Drupal 4.x.x - if [ "$new_MAJOR" == "4" ]; then + if [ "$new_major" == "4" ]; then rsync -av ../drupal-$old/themes/ themes/ for module in `ls ../drupal-$old/modules`; do if [ -d "../drupal-$old/modules/$module" ]; then @@ -110,7 +110,7 @@ function drupal_upgrade { fi # Copy installation profiles for Drupal 5.x or newer - if [ "$new_MAJOR" != "4" ]; then + if [ "$new_major" != "4" ]; then rsync -av --exclude=default ../drupal-$old/profiles/ profiles/ fi |