aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-05-12 15:25:32 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-05-12 15:25:32 -0300
commit9539c86bd89b6d4cd642c6bbe8c9c784b1ff58d7 (patch)
treea158f752ef742acaa0ddf0fa8b45f720680ca65a
parent58965c249b3d94b682c6cf7afa60c1e5900cfa36 (diff)
downloadpuppet-drupal-9539c86bd89b6d4cd642c6bbe8c9c784b1ff58d7.tar.gz
puppet-drupal-9539c86bd89b6d4cd642c6bbe8c9c784b1ff58d7.tar.bz2
Deal with a possibly empty drupal folder
-rw-r--r--templates/drupal.sh.erb4
1 files changed, 3 insertions, 1 deletions
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
}