Symlink handling on upgrades

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index f2596abf340ae5e9bbe608b0d4ec8ab75c4487e3..cd633c8ec34dd747b52dfee93050518480715c24 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -162,7 +162,16 @@ function drupal_upgrade {
   cd $BASE/drupal-$new
 
   # Copy files
-  cp -Rp ../drupal-$old/{.htaccess,favicon.ico,files/,sites/} . &> /dev/null
+  for file in .htaccess favicon.ico files sites; do
+    if [ ! -h "../drupal-$old/$file" ]; then
+      cp -a ../drupal-$old/$file . &> /dev/null
+    else
+      # Symlink handling
+      ln -sf $file `readlink ../drupal-$old/$file`
+    fi
+  done
+
+  # Extra folder
   for extra_folder in $extra_folders; do
     if [ -d ../drupal-$old/$extra_folder ]; then
       cp -Rp ../drupal-$old/$extra_folder .