summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-15 20:24:06 +0200
committerGitHub <noreply@github.com>2016-08-15 20:24:06 +0200
commit36647dbb671054362791fe73f574da2bd486f59e (patch)
treef3dba86910dd334b93a047dc61aa0151a5e72fee
parent396678c9ce98c901384c827e3a45173cf6c8c5bb (diff)
parentb5f61ba0e260acd220adc3e8b4f6285b0d265ca7 (diff)
downloadnextcloud-server-36647dbb671054362791fe73f574da2bd486f59e.tar.gz
nextcloud-server-36647dbb671054362791fe73f574da2bd486f59e.zip
Merge pull request #876 from nextcloud/licence
Licence script update
-rw-r--r--build/license.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/build/license.php b/build/license.php
index 11675f21a07..5ada91a0f33 100644
--- a/build/license.php
+++ b/build/license.php
@@ -99,7 +99,7 @@ EOD;
$excludes = array_map(function($item) use ($folder) {
return $folder . '/' . $item;
- }, ['vendor', '3rdparty', '.git', 'l10n', 'templates']);
+ }, ['vendor', '3rdparty', '.git', 'l10n', 'templates', 'composer']);
$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
@@ -154,7 +154,12 @@ With help from many libraries and frameworks including:
} else {
$license = str_replace('@AUTHORS@', $authors, $this->licenseText);
}
- $license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+
+ if ($copyrightNotices === '') {
+ $license = str_replace('@COPYRIGHT@', ' *', $license);
+ } else {
+ $license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+ }
$source = $this->eatOldLicense($source);
$source = "<?php" . PHP_EOL . $license . PHP_EOL . $source;