Skip to content

Commit bb1ec6c

Browse files
authored
Merge pull request #302 from facebook/changeLicense
Change license to MIT
2 parents be17f46 + 3e4aee3 commit bb1ec6c

37 files changed

Lines changed: 144 additions & 259 deletions

LICENSE

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
BSD License
1+
MIT License
22

3-
For PathPicker software
3+
Copyright (c) Facebook, Inc. and its affiliates.
44

5-
Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
611

7-
Redistribution and use in source and binary forms, with or without modification,
8-
are permitted provided that the following conditions are met:
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
914

10-
* Redistributions of source code must retain the above copyright notice, this
11-
list of conditions and the following disclaimer.
12-
13-
* Redistributions in binary form must reproduce the above copyright notice,
14-
this list of conditions and the following disclaimer in the documentation
15-
and/or other materials provided with the distribution.
16-
17-
* Neither the name Facebook nor the names of its contributors may be used to
18-
endorse or promote products derived from this software without specific
19-
prior written permission.
20-
21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
22-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
25-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
26-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
28-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

PATENTS

Lines changed: 0 additions & 33 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,4 @@ For all documentation and configuration options, see the output of `fpp --help`.
127127
See the CONTRIBUTING file for how to help out.
128128

129129
## License
130-
PathPicker is BSD-licensed. We also provide an additional patent grant.
130+
PathPicker is MIT licensed.

assets/launch_page.css

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
/**
2-
* Copyright (c) 2015-present, Facebook, Inc.
3-
* All rights reserved.
4-
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
8-
*/
2+
Copyright (c) Facebook, Inc. and its affiliates.
3+
This source code is licensed under the MIT license found in the
4+
LICENSE file in the root directory of this source tree.
5+
**/
96

107
html {
118
background-color:#fff;

debian/package.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
# Copyright (c) 2015-present, Facebook, Inc.
2+
# Copyright (c) Facebook, Inc. and its affiliates.
3+
#
4+
# This source code is licensed under the MIT license found in the
5+
# LICENSE file in the root directory of this source tree.
36
PTH="$(pwd)"
47
VERSION="$(python "$PTH/../src/version.py")"
58
DATETIME=$(date '+%a, %d %b %Y %H:%M:%S %z')

fpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
#!/bin/bash
2-
# Copyright (c) 2015-present, Facebook, Inc.
3-
# All rights reserved.
2+
# Copyright (c) Facebook, Inc. and its affiliates.
43
#
5-
# This source code is licensed under the BSD-style license found in the
6-
# LICENSE file in the root directory of this source tree. An additional grant
7-
# of patent rights can be found in the PATENTS file in the same directory.
4+
# This source code is licensed under the MIT license found in the
5+
# LICENSE file in the root directory of this source tree.
86
#
9-
107
# get the directory of this script so we can execute the related python
118
# http://stackoverflow.com/a/246128/212110
129
SOURCE=$0

fpp.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# Copyright (c) 2015-present, Facebook, Inc.
1+
# Copyright (c) Facebook, Inc. and its affiliates.
2+
#
3+
# This source code is licensed under the MIT license found in the
4+
# LICENSE file in the root directory of this source tree.
25
class Fpp < Formula
36
desc "CLI program that accepts piped input and presents files for selection"
47
homepage "https://facebook.github.io/PathPicker/"

index.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<!DOCTYPE html>
22
<!--
3-
/**
4-
* Copyright (c) 2015-present, Facebook, Inc.
5-
* All rights reserved.
6-
*
7-
* This source code is licensed under the BSD-style license found in the
8-
* LICENSE file in the root directory of this source tree. An additional grant
9-
* of patent rights can be found in the PATENTS file in the same directory.
10-
*/
3+
Copyright (c) Facebook, Inc. and its affiliates.
4+
5+
This source code is licensed under the MIT license found in the
6+
LICENSE file in the root directory of this source tree.
117
-->
128
<html lang="en">
139
<head>

scripts/buildAndTest.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
# Copyright (c) 2015-present, Facebook, Inc.
2+
# Copyright (c) Facebook, Inc. and its affiliates.
3+
#
4+
# This source code is licensed under the MIT license found in the
5+
# LICENSE file in the root directory of this source tree.
36

47
if ! type autopep8 > /dev/null; then
58
echo "'autopep8' required for build."

scripts/makeDist.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
# Copyright (c) 2015-present, Facebook, Inc.
2+
# Copyright (c) Facebook, Inc. and its affiliates.
3+
#
4+
# This source code is licensed under the MIT license found in the
5+
# LICENSE file in the root directory of this source tree.
36
VERSION="$(python ./src/version.py)"
47
DEST="./dist/fpp.$VERSION.tar.gz"
58
mkdir -p ./dist/

0 commit comments

Comments
 (0)