From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Jan 2013 13:36:37 +0000 (-0200)
Subject: Drush's site-install just works for 7.x+
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=584961d78fcf937a019b0fa77bf9238f10e4f7ad;p=puppet-drupal.git

Drush's site-install just works for 7.x+
---

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index d10658a..e3d9c25 100644
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -381,12 +381,14 @@ EOF
     fi
   fi
 
-  (
-  echo "Installing drupal $series for $site using $profile profile..."
-  cd $BASE/drupal-$series/
-  drush site-install $profile --site-name="$name" --site-mail="$site_email" --locale=$locale \
-    --uri="$site" --sites-subdir="$site" --account-name="$admin" --account-mail="$admin_email"
-  )
+  if [ "$series" != "6" ]; then
+    (
+    echo "Installing drupal $series for $site using $profile profile..."
+    cd $BASE/drupal-$series/
+    drush site-install $profile --site-name="$name" --site-mail="$site_email" --locale=$locale \
+      --uri="$site" --sites-subdir="$site" --account-name="$admin" --account-mail="$admin_email"
+    )
+  fi
 
   # Fix permissions
   if grep -qe "^$site:" /etc/passwd; then
@@ -397,7 +399,11 @@ EOF
     chown www-data.www-data $SITES/$site/drupal/files
   fi
 
-  echo "Done. Please check your installation."
+  if [ "$series" == "6" ]; then
+    echo "Now please access http://$site.$domain/install.php to continue with the installation."
+  else
+    echo "Done. Please check your installation."
+  fi
 }
 
 # Main procedure