Make the license less restrictive. See #14 (#28)

* Make the license less restrictive. See #14

So that people can use _just_ main.sh without bothering with also
distributing the license

* Add license update to changelog

* Add a comment about expansion, see #26

* Use an unmodified MIT License, with the more permissive clause inside the code

As modifying the MIT License will needlessly (but rightfully) cause
suspicion

* Credit @bravo-kernel for his feedback

* Fix another typo

* Reword copyright

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)

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.
+SOFTWARE.

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:<Alexander.Rathai@gmail.com>)
-- [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)  
+Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors)
-Licensed under MIT: [http://kvz.io/licenses/LICENSE-MIT](http://kvz.io/licenses/LICENSE-MIT)
+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.

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) and contributors
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
+# 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

src/ini_val.sh

@@ -29,8 +29,10 @@
 #
 #  ini_val.sh data.ini connection.host 127.0.0.1
 #
-# Licensed under MIT
+# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors)
-# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io)
+# 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:-}"

src/megamount.sh

@@ -31,8 +31,10 @@
 #
 #  megamount.sh smb://janedoe:abc123@192.168.0.1/documents /mnt/documents
 #
-# Licensed under MIT
+# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors)
-# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io)
+# 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"

src/parse_url.sh

@@ -28,8 +28,10 @@
 #
 #  parse_url.sh 'http://johndoe:abc123@example.com:8080/index.html'
 #
-# Licensed under MIT
+# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors)
-# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io)
+# 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}"

src/templater.sh

@@ -27,8 +27,10 @@
 #
 #  ALLOW_REMAINDERS=1 templater.sh input.cfg output.cfg
 #
-# Licensed under MIT
+# Copyright (c) 2013 Kevin van Zonneveld and [contributors](https://github.com/kvz/bash3boilerplate#authors)
-# Copyright (c) 2016 Kevin van Zonneveld (http://kvz.io)
+# 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}"