Skip to content

Commit

Permalink
Merge pull request #568 from nextcloud/jtr-fix-extra-files-instructions
Browse files Browse the repository at this point in the history
fix(updater): Add instructions to extra files found error
  • Loading branch information
come-nc authored Jun 4, 2024
2 parents 9965212 + 8d2db89 commit 3b634b9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,7 @@ function performStep(number, callback) {
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response['detailedResponseText']) + '</code></pre></details>';
} else {
text = 'The following extra files have been found:<ul>';
text = 'Unknown files detected within the installation folder. This can be fixed by manually removing (or moving) these files. The following extra files have been found:<ul>';
response['response'].forEach(function(file) {
text += '<li>' + escapeHTML(file) + '</li>';
});
Expand Down
2 changes: 1 addition & 1 deletion index.web.php
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ function performStep(number, callback) {
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response['detailedResponseText']) + '</code></pre></details>';
} else {
text = 'The following extra files have been found:<ul>';
text = 'Unknown files detected within the installation folder. This can be fixed by manually removing (or moving) these files. The following extra files have been found:<ul>';
response['response'].forEach(function(file) {
text += '<li>' + escapeHTML(file) + '</li>';
});
Expand Down
2 changes: 1 addition & 1 deletion lib/UpdateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
if (is_string($result['response'])) {
$output->writeln('<error>' . $result['response'] . '</error>');
} else {
$output->writeln('<error>The following extra files have been found:</error>');
$output->writeln('<error>Unknown files detected within the installation folder. This can be fixed by manually removing (or moving) these files. The following extra files have been found:</error>');
foreach ($result['response'] as $file) {
$output->writeln('<error> ' . $file . '</error>');
}
Expand Down
Binary file modified updater.phar
Binary file not shown.

0 comments on commit 3b634b9

Please sign in to comment.