aboutsummaryrefslogtreecommitdiff
path: root/templates/drupal.sh.erb
diff options
context:
space:
mode:
Diffstat (limited to 'templates/drupal.sh.erb')
-rw-r--r--templates/drupal.sh.erb10
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