diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a98529..5a59bf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Please see the [CHANGELOG.md](./CHANGELOG.md) file. ## master (Unreleased) +- Make license more permissive by not requiring distribution of the LICENSE file if the copyright & attribution comments are left intact - Respect `--no-color` by setting the NO_COLOR flag in `main.sh` (#25, thx @gdevenyi) - Split out changelog into separate file - Added a [FAQ](./FAQ.md) (#15, #14, thanks @rouson) diff --git a/LICENSE b/LICENSE index 899878a..a9fd3b8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Kevin van Zonneveld +Copyright (c) 2013 Kevin van Zonneveld and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ 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. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index d10903b..aea389e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ## Overview -When hacking up BASH scripts, I often find there are some +When hacking up Bash scripts, I often find there are some higher level things like logging, configuration, command-line argument parsing that: @@ -112,9 +112,10 @@ Please see the [FAQ.md](./FAQ.md) file. - [Kevin van Zonneveld](http://kvz.io) - [Izaak Beekman](https://izaakbeekman.com/) - [Alexander Rathai](mailto:) -- [Dr. Damian Rouson](http://www.sourceryinstitute.org/) (documentation) +- [Dr. Damian Rouson](http://www.sourceryinstitute.org/) (documentation, feedback) - [@jokajak](https://github.com/jokajak) (documentation) - [Gabriel A. Devenyi](http://staticwave.ca/) (feedback) +- [@bravo-kernel](https://github.com/bravo-kernel) (feedback) ## Sponsoring @@ -124,5 +125,7 @@ Please see the [FAQ.md](./FAQ.md) file. ## License -Copyright (c) 2013 Kevin van Zonneveld, [http://kvz.io](http://kvz.io) -Licensed under MIT: [http://kvz.io/licenses/LICENSE-MIT](http://kvz.io/licenses/LICENSE-MIT) +Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors) +Licensed under [MIT](https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE) +You are not obligated to bundle the LICENSE file with your b3bp projects as long +as you leave these references intact. diff --git a/main.sh b/main.sh index 75c4626..67ee5a7 100755 --- a/main.sh +++ b/main.sh @@ -24,8 +24,10 @@ # # LOG_LEVEL=7 ./main.sh -f /tmp/x -d # -# Licensed under MIT -# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io) +# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io) and contributors +# Licensed under MIT: https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE +# You are not obligated to ship the license file with your b3bp projects as long +# as you leave the above comments intact. ### Configuration diff --git a/src/ini_val.sh b/src/ini_val.sh index 94c705d..7de6b2e 100755 --- a/src/ini_val.sh +++ b/src/ini_val.sh @@ -29,8 +29,10 @@ # # ini_val.sh data.ini connection.host 127.0.0.1 # -# Licensed under MIT -# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io) +# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors) +# Licensed under [MIT](https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE) +# You are not obligated to bundle the LICENSE file with your b3bp projects as long +# as you leave these references intact. function ini_val() { local file="${1:-}" diff --git a/src/megamount.sh b/src/megamount.sh index 0712ae6..994a8bd 100644 --- a/src/megamount.sh +++ b/src/megamount.sh @@ -31,8 +31,10 @@ # # megamount.sh smb://janedoe:abc123@192.168.0.1/documents /mnt/documents # -# Licensed under MIT -# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io) +# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors) +# Licensed under [MIT](https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE) +# You are not obligated to bundle the LICENSE file with your b3bp projects as long +# as you leave these references intact. __dir=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) source "${__dir}/parse_url.sh" diff --git a/src/parse_url.sh b/src/parse_url.sh index 6c38c2a..65d94b8 100644 --- a/src/parse_url.sh +++ b/src/parse_url.sh @@ -28,8 +28,10 @@ # # parse_url.sh 'http://johndoe:abc123@example.com:8080/index.html' # -# Licensed under MIT -# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io) +# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors) +# Licensed under [MIT](https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE) +# You are not obligated to bundle the LICENSE file with your b3bp projects as long +# as you leave these references intact. function parse_url() { local parse="${1}" diff --git a/src/templater.sh b/src/templater.sh index f0e4bc4..77410b6 100755 --- a/src/templater.sh +++ b/src/templater.sh @@ -27,8 +27,10 @@ # # ALLOW_REMAINDERS=1 templater.sh input.cfg output.cfg # -# Licensed under MIT -# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io) +# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors) +# Licensed under [MIT](https://raw.githubusercontent.com/kvz/bash3boilerplate/master/LICENSE) +# You are not obligated to bundle the LICENSE file with your b3bp projects as long +# as you leave these references intact. function templater() { ALLOW_REMAINDERS="${ALLOW_REMAINDERS:-0}"