Skip to content

Commit

Permalink
Merge pull request #505 from nextcloud/fix-license-script
Browse files Browse the repository at this point in the history
Fix the license script
  • Loading branch information
MorrisJobke committed Jul 21, 2016
2 parents febf95f + b64c6d6 commit 363ca21
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions build/license.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function exec($folder, $gitRoot = false) {

function writeAuthorsFile() {
ksort($this->authors);
$template = "ownCloud is written by:
$template = "Nextcloud is written by:
@AUTHORS@
With help from many libraries and frameworks including:
Expand Down Expand Up @@ -228,9 +228,10 @@ private function eatOldLicense($source) {

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;
}
Expand Down Expand Up @@ -277,7 +278,7 @@ private function checkCopyrightState($path, $gitRoot) {
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) {
Expand Down Expand Up @@ -349,6 +350,7 @@ private function checkCoreMailMap($author) {
$licenses->exec($argv[1], isset($argv[2]) ? $argv[1] : false);
} else {
$licenses->exec([
'../apps/admin_audit',
'../apps/comments',
'../apps/dav',
'../apps/encryption',
Expand All @@ -362,8 +364,10 @@ private function checkCoreMailMap($author) {
'../apps/provisioning_api',
'../apps/systemtags',
'../apps/testing',
'../apps/theming',
'../apps/updatenotification',
'../apps/user_ldap',
'../build/integration/features/bootstrap',
'../core',
'../lib',
'../ocs',
Expand Down

0 comments on commit 363ca21

Please sign in to comment.