From 8fc3bae92789167756ab3d1cb44c6eff16552fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 19 Dec 2023 17:47:01 +0100 Subject: [PATCH] fix update --- bin/installto.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/installto.sh b/bin/installto.sh index f494d1ba687..cb64110b76a 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -78,8 +78,9 @@ if (strtolower($input) == 'y') { } } - foreach (['index.php', 'config/defaults.inc.php', 'composer.json', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { - $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "$file $target_dir/$file"; + foreach (['index.php', 'config/defaults.inc.php', 'composer.json-dist', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { + $source_file = $file === 'composer.json-dist' ? 'composer.json' : $file; + $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "$source_file $target_dir/$file"; if (file_exists(INSTALL_PATH . $file) && (system($command, $ret) === false || $ret > 0)) { rcube::raise_error("Failed to execute command: $command", false, true);