From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 12 May 2012 18:25:32 +0000 (-0300)
Subject: Deal with a possibly empty drupal folder
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9539c86bd89b6d4cd642c6bbe8c9c784b1ff58d7;p=puppet-drupal.git

Deal with a possibly empty drupal folder
---

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index cd633c8..c6b9ca9 100644
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -111,7 +111,9 @@ function drupal_deploy {
   fi
 
   # Make symlink if needed.
-  if [ ! -e "$BASE/drupal-$drupal_series" ]; then
+  if [ ! -e "$BASE/drupal-$drupal_series/CHANGELOG.txt" ]; then
+    # Deal with a possibly empty drupal folder
+    rmdir $BASE/drupal-$drupal_series &> /dev/null
     ( cd $BASE && ln -s drupal-$new drupal-$drupal_series )
   fi
 }