From f1d293755a584c919a1b0d3fee206ebcd4ca4cf9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 29 Dec 2009 18:51:52 -0200
Subject: Template fix (2)

---
 templates/drupal.sh.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates')

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
   
-- 
cgit v1.2.3