Upgrade: copy image.imagemagick.inc to includes/ folder

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 06455f9bec1cde7f5573ba7f82b5b954b9bcf9ee..f87fa8a46face3c11fae5b3a10c29ed101da1d48 100644 (file)
--- 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