Deal with a possibly empty drupal folder

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index cd633c8ec34dd747b52dfee93050518480715c24..c6b9ca9547b7ee91a4afd47d0432bec2763191e2 100644 (file)
--- 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
 }