Fix so upgrade script makes sure program/lib directory does not contain old libraries (#5287)

pull/5754/head
Aleksander Machniak 8 years ago
parent 2913267c3a
commit 533af8784e

@ -17,6 +17,7 @@ CHANGELOG Roundcube Webmail
- Fix searching by email address in contacts with multiple addresses (#5291)
- Fix handling of --delete argument in moduserprefs.sh script (#5296)
- Workaround PHP issue by calling closelog() on script shutdown when using log_driver=syslog (#5289)
- Fix so upgrade script makes sure program/lib directory does not contain old libraries (#5287)
RELEASE 1.2.0
-------------

@ -5,7 +5,7 @@
| bin/installto.sh |
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2014, The Roundcube Dev Team |
| Copyright (C) 2014-2016, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@ -55,7 +55,9 @@ if (strtolower($input) == 'y') {
$dirs[] = 'vendor';
}
foreach ($dirs as $dir) {
if (!system("rsync -avC " . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
// @FIXME: should we use --delete for all directories?
$delete = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
if (!system("rsync -avC " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
$err = true;
break;
}

Loading…
Cancel
Save