diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-07-21 23:48:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 23:48:31 +0200 |
commit | 363ca21085d04f809879296e22e719f25433b3d4 (patch) | |
tree | a9d3a62973077a68a14c6a13afe1dd8498d1e7e7 /build | |
parent | febf95ffb4641e688012bcb7dd0458fbcc3ef4da (diff) | |
parent | b64c6d6993ca30882f7c7e06344e1b7de34ca817 (diff) | |
download | nextcloud-server-363ca21085d04f809879296e22e719f25433b3d4.tar.gz nextcloud-server-363ca21085d04f809879296e22e719f25433b3d4.zip |
Merge pull request #505 from nextcloud/fix-license-script
Fix the license script
Diffstat (limited to 'build')
-rw-r--r-- | build/license.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/license.php b/build/license.php index 1712899d686..11675f21a07 100644 --- a/build/license.php +++ b/build/license.php @@ -124,7 +124,7 @@ EOD; function writeAuthorsFile() { ksort($this->authors); - $template = "ownCloud is written by: + $template = "Nextcloud is written by: @AUTHORS@ With help from many libraries and frameworks including: @@ -228,9 +228,10 @@ With help from many libraries and frameworks including: private function getCopyrightNotices($path, $file) { $licenseHeaderEndsAtLine = (int)trim(shell_exec("grep -n '*/' $path | head -n 1 | cut -d ':' -f 1")); - $lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine); + $lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine + 1); $copyrightNotice = []; - foreach ($lineByLine as $line) { + $licensePart = array_slice($lineByLine, 0, $licenseHeaderEndsAtLine); + foreach ($licensePart as $line) { if (strpos($line, '@copyright') !== false) { $copyrightNotice[] = $line; } @@ -277,7 +278,7 @@ With help from many libraries and frameworks including: private function printFilesToCheck() { if (!empty($this->checkFiles)) { print "\n"; - print "For following files all lines changes since the Nextcloud fork." . PHP_EOL; + print "For following files all lines changed since the Nextcloud fork." . PHP_EOL; print "Please check if these files can be moved over to AGPLv3 or later" . PHP_EOL; print "\n"; foreach ($this->checkFiles as $file) { @@ -349,6 +350,7 @@ if (isset($argv[1])) { $licenses->exec($argv[1], isset($argv[2]) ? $argv[1] : false); } else { $licenses->exec([ + '../apps/admin_audit', '../apps/comments', '../apps/dav', '../apps/encryption', @@ -362,8 +364,10 @@ if (isset($argv[1])) { '../apps/provisioning_api', '../apps/systemtags', '../apps/testing', + '../apps/theming', '../apps/updatenotification', '../apps/user_ldap', + '../build/integration/features/bootstrap', '../core', '../lib', '../ocs', |