From 373b112f349e5587f0a54c6086fb6654109d3013 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 6 Oct 2011 08:20:11 +0000
Subject: Force files to be updated, even if newer (#1488117)

---
 CHANGELOG        | 4 ++++
 bin/installto.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bd06731e0..c5adfcb89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Force all files to be overwritten when updating (#1488117)
+
+RELEASE 0.6
+-----------
 - Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#1488107)
 - Fix namespace handling in special folders settings (#1488112)
 - Disable time limit for CLI scripts (#1488109)
diff --git a/bin/installto.sh b/bin/installto.sh
index b1e2956a1..47c959ad7 100755
--- a/bin/installto.sh
+++ b/bin/installto.sh
@@ -45,13 +45,13 @@ if (strtolower($input) == 'y') {
   $err = false;
   echo "Copying files to target location...";
   foreach (array('program','installer','bin','SQL','plugins','skins/default') as $dir) {
-    if (!system("rsync -avuC " . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
+    if (!system("rsync -avC " . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
       $err = true;
       break;
     }
   }
   foreach (array('index.php','.htaccess','config/main.inc.php.dist','config/db.inc.php.dist','CHANGELOG','README','UPGRADING') as $file) {
-    if (!system("rsync -avu " . INSTALL_PATH . "$file $target_dir/$file")) {
+    if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) {
       $err = true;
       break;
     }
-- 
cgit v1.2.3