Skip to content

Commit

Permalink
Change license to MIT
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Cottle committed May 17, 2019
1 parent 641945a commit 774e6b7
Show file tree
Hide file tree
Showing 37 changed files with 149 additions and 266 deletions.
43 changes: 17 additions & 26 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
BSD License
MIT License

For PathPicker software
Copyright (c) Facebook, Inc. and its affiliates.

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

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

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name Facebook nor the names of its contributors may be used to
endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
33 changes: 0 additions & 33 deletions PATENTS

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ For all documentation and configuration options, see the output of `fpp --help`.
See the CONTRIBUTING file for how to help out.

## License
PathPicker is BSD-licensed. We also provide an additional patent grant.
PathPicker is MIT licensed.
11 changes: 4 additions & 7 deletions assets/launch_page.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
Copyright (c) Facebook, Inc. and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
**/

html {
background-color:#fff;
Expand Down
5 changes: 4 additions & 1 deletion debian/package.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
# Copyright (c) 2015-present, Facebook, Inc.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
PTH="$(pwd)"
VERSION="$(python "$PTH/../src/version.py")"
DATETIME=$(date '+%a, %d %b %Y %H:%M:%S %z')
Expand Down
9 changes: 3 additions & 6 deletions fpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#!/bin/bash
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
#

# get the directory of this script so we can execute the related python
# http://stackoverflow.com/a/246128/212110
SOURCE=$0
Expand Down
5 changes: 4 additions & 1 deletion fpp.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Copyright (c) 2015-present, Facebook, Inc.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
class Fpp < Formula
desc "CLI program that accepts piped input and presents files for selection"
homepage "https://facebook.github.io/PathPicker/"
Expand Down
12 changes: 4 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<!DOCTYPE html>
<!--
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
Copyright (c) Facebook, Inc. and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->
<html lang="en">
<head>
Expand Down
5 changes: 4 additions & 1 deletion scripts/buildAndTest.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
# Copyright (c) 2015-present, Facebook, Inc.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

if ! type autopep8 > /dev/null; then
echo "'autopep8' required for build."
Expand Down
5 changes: 4 additions & 1 deletion scripts/makeDist.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
# Copyright (c) 2015-present, Facebook, Inc.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
VERSION="$(python ./src/version.py)"
DEST="./dist/fpp.$VERSION.tar.gz"
mkdir -p ./dist/
Expand Down
5 changes: 4 additions & 1 deletion scripts/makeManpage.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
# Copyright (c) 2015-present, Facebook, Inc.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
command -v a2x >/dev/null 2>&1 || { echo >&2 "I require a2x provided by asciidoc, but it's not installed. Aborting."; exit 1; }
python src/usageStrings.py > manpage.adoc;
a2x --doctype manpage --format manpage manpage.adoc --destination-dir ./debian/usr/share/man/man1/;
Expand Down
8 changes: 3 additions & 5 deletions src/__tests__/cursesForTest.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
#
from __future__ import print_function

Expand Down
10 changes: 3 additions & 7 deletions src/__tests__/keyBindingsForTest.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
#

# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
KEY_BINDINGS_FOR_TEST_CONFIG_CONTENT = "[bindings]\nr = rspec\ns = subl\n"


Expand Down
9 changes: 3 additions & 6 deletions src/__tests__/localTestCases.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
#

# If you have specific test cases local to your dev environment,
# add them here
LOCAL_TEST_CASES = []
11 changes: 4 additions & 7 deletions src/__tests__/screenForTest.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
from __future__ import print_function

from charCodeMapping import CHAR_TO_CODE
import sys
sys.path.insert(0, '../')
from charCodeMapping import CHAR_TO_CODE

ATTRIBUTE_SYMBOL_MAPPING = {
0: ' ',
Expand Down
23 changes: 9 additions & 14 deletions src/__tests__/screenTestRunner.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
from __future__ import print_function

from keyBindingsForTest import KeyBindingsForTest
from cursesForTest import CursesForTest
from screenForTest import ScreenForTest
from screenFlags import ScreenFlags
import processInput
import choose
import curses
import sys
import os

sys.path.insert(0, '../')

import choose
import processInput

from screenFlags import ScreenFlags

from screenForTest import ScreenForTest
from cursesForTest import CursesForTest
from keyBindingsForTest import KeyBindingsForTest

INPUT_DIR = './inputs/'

Expand Down
23 changes: 9 additions & 14 deletions src/__tests__/testKeyBindingsParsing.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
from keyBindingsForTest import KEY_BINDINGS_FOR_TEST_CONFIG_CONTENT
from keyBindingsForTest import KeyBindingsForTest
from keyBindings import KeyBindings
import tempfile
import keyBindings
import unittest
import sys

sys.path.insert(0, '../')

import unittest
import keyBindings
import tempfile

from keyBindings import KeyBindings
from keyBindingsForTest import KeyBindingsForTest
from keyBindingsForTest import KEY_BINDINGS_FOR_TEST_CONFIG_CONTENT


class TestKeyBindingsParser(unittest.TestCase):

Expand Down
17 changes: 7 additions & 10 deletions src/__tests__/testParsing.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
from __future__ import print_function

import parse
from localTestCases import LOCAL_TEST_CASES
from formattedText import FormattedText
import format
import sys
import unittest
import os
sys.path.insert(0, '../')

import format
from formattedText import FormattedText
from localTestCases import LOCAL_TEST_CASES
import parse

fileTestCases = [{
'input': 'html/js/hotness.js',
Expand Down
15 changes: 6 additions & 9 deletions src/__tests__/testScreen.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
from __future__ import print_function

import screenTestRunner
import os
import unittest
import sys
sys.path.insert(0, '../')
import unittest
import os

import screenTestRunner

EXPECTED_DIR = './expected/'
screenTestCases = [{
Expand Down
10 changes: 4 additions & 6 deletions src/charCodeMapping.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Copyright (c) 2015-present, Facebook, Inc.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from __future__ import print_function

import curses
Expand Down
Loading

0 comments on commit 774e6b7

Please sign in to comment.