diff options
| -rwxr-xr-x | contrib/commit-msg/duplicate-signedoffby | 5 | ||||
| -rwxr-xr-x | contrib/commit-msg/spellcheck | 5 | ||||
| -rwxr-xr-x | contrib/pre-commit/bash_syntax | 5 | ||||
| -rwxr-xr-x | contrib/pre-commit/copyright_year | 5 | ||||
| -rwxr-xr-x | contrib/pre-commit/whitespace | 5 | ||||
| -rwxr-xr-x | contrib/pre-receive/freespace | 5 | ||||
| -rwxr-xr-x | git-hooks | 5 | ||||
| -rwxr-xr-x | git_hooks/commit-msg/signed-off-by | 5 | ||||
| -rwxr-xr-x | git_hooks/pre-commit/bsd | 12 |
9 files changed, 12 insertions, 40 deletions
diff --git a/contrib/commit-msg/duplicate-signedoffby b/contrib/commit-msg/duplicate-signedoffby index d4271b1..34b9985 100755 --- a/contrib/commit-msg/duplicate-signedoffby +++ b/contrib/commit-msg/duplicate-signedoffby @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/contrib/commit-msg/spellcheck b/contrib/commit-msg/spellcheck index 0167d69..de4147c 100755 --- a/contrib/commit-msg/spellcheck +++ b/contrib/commit-msg/spellcheck @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/contrib/pre-commit/bash_syntax b/contrib/pre-commit/bash_syntax index 714e298..5fecbfe 100755 --- a/contrib/pre-commit/bash_syntax +++ b/contrib/pre-commit/bash_syntax @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/contrib/pre-commit/copyright_year b/contrib/pre-commit/copyright_year index e879381..cea0fe6 100755 --- a/contrib/pre-commit/copyright_year +++ b/contrib/pre-commit/copyright_year @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/contrib/pre-commit/whitespace b/contrib/pre-commit/whitespace index f5bbee3..d2b4a6e 100755 --- a/contrib/pre-commit/whitespace +++ b/contrib/pre-commit/whitespace @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/contrib/pre-receive/freespace b/contrib/pre-receive/freespace index d4eae85..acf3c02 100755 --- a/contrib/pre-receive/freespace +++ b/contrib/pre-receive/freespace @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/git_hooks/commit-msg/signed-off-by b/git_hooks/commit-msg/signed-off-by index 9fddff7..5dbafb4 100755 --- a/git_hooks/commit-msg/signed-off-by +++ b/git_hooks/commit-msg/signed-off-by @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # diff --git a/git_hooks/pre-commit/bsd b/git_hooks/pre-commit/bsd index 3080cef..3393348 100755 --- a/git_hooks/pre-commit/bsd +++ b/git_hooks/pre-commit/bsd @@ -10,10 +10,7 @@ # 2. 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Benjamin C. Meyer. -# 4. Neither the name of the project nor the +# 3. Neither the name of the project nor the # names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. # @@ -34,10 +31,9 @@ function test_file { if grep 'Copyright (c)' "${file}" | grep -v 'grep' >/dev/null 2>&1 ; then set -e grep "Redistribution and use in source and binary forms, with or without" "${file}" >/dev/null - grep "1. Redistributions of source code must retain the above copyright" "${file}" >/dev/null - grep "2. Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null - grep "3. All advertising materials mentioning features or use of this software" "${file}" >/dev/null - grep "4. Neither the name of the project nor the" "${file}" >/dev/null + grep "Redistributions of source code must retain the above copyright" "${file}" >/dev/null + grep "Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null + grep "Neither the name of the project nor the" "${file}" >/dev/null set +e fi } |