diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-06-20 15:27:20 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-06-20 15:27:20 -0300 |
| commit | cb941efbfee33045a8140fcfccb6855456ce2174 (patch) | |
| tree | 8ef15a7af83fef05ad22b4acdd30dc3cfa0f3dce /templates | |
| parent | b2f21a573d049cd2b978901959a78b8e29c12c5f (diff) | |
| download | puppet-drupal-cb941efbfee33045a8140fcfccb6855456ce2174.tar.gz puppet-drupal-cb941efbfee33045a8140fcfccb6855456ce2174.tar.bz2 | |
Upgrade: copy image.imagemagick.inc to includes/ folder
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/drupal.sh.erb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 06455f9..f87fa8a 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -111,7 +111,10 @@ function drupal_upgrade { # Deploy a fresh drupal tree drupal_deploy $new - + + # Ensure we're in the new drupal folder + cd $BASE/drupal-$new + # Copy files cp -Rp ../drupal-$old/{.htaccess,favicon.ico,files/,sites/} . &> /dev/null for extra_folder in $extra_folders; do @@ -134,6 +137,11 @@ function drupal_upgrade { if [ "$new_major" != "4" ]; then rsync -av --exclude=default ../drupal-$old/profiles/ profiles/ fi + + # Misc: copy image.imagemagick.inc to includes/ folder + if [ -e "../drupal-$old/sites/all/modules/image/image.imagemagick.inc" ]; then + cp ../drupal-$old/sites/all/modules/image/image.imagemagick.inc includes/ + fi # Change symlink to point to the new location cd $BASE ; rm -rf drupal-$drupal_series && ln -s drupal-$new drupal-$drupal_series |