diff options
Diffstat (limited to 'contrib/scripts/afferify')
| -rwxr-xr-x | contrib/scripts/afferify | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/contrib/scripts/afferify b/contrib/scripts/afferify index 188b66c640..7bd7dbd9f7 100755 --- a/contrib/scripts/afferify +++ b/contrib/scripts/afferify @@ -43,6 +43,9 @@ sub wanted { # Debugging: What's inside the file we just read? # print STDERR '> ', $_; +if (0) { +# This code did the initial conversion. We ifdef it out. + # Good idea to have the text start with "GNUnet" rather than "This program" if ( s#GNUnet is free software; you can redistribute it and/or modify it under the#GNUnet is free software: you can redistribute it and/or modify it# ) { # Whoever had the idea of reformatting the GPL license text... @@ -52,7 +55,7 @@ sub wanted { # to read perl code: if regexps appear without any # context, it means they are applied to the default # variable being '$_'. - return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU General Public License as published#; + return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU Affero General Public License as published#; return unless s#^(\W*\s+)Foundation; either version \d, or \(at your option\) any later version\.#\1by the Free Software Foundation, either version 3 of the License,\n\1or (at your option) any later version.#m; return unless s#GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY#GNUnet is distributed in the hope that it will be useful, but#; return unless s#WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR#WITHOUT ANY WARRANTY; without even the implied warranty of#; @@ -64,7 +67,7 @@ sub wanted { print STDERR "\nTrying regular style on $name\t"; # Patterns are designed to also match some typos and substitutions. - return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU General Public License as published#; + return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU Affero General Public License as published#; return unless s#by the Free Software Foundation; either version \d, or \(at your#by the Free Software Foundation, either version 3 of the License,#; return unless s#option\) any later version\.#or (at your option) any later version.#; return unless s#General Public Lice\w+ for more details\.#Affero General Public License for more details.#; @@ -72,6 +75,16 @@ sub wanted { } print STDERR "OK"; +} else { +# This is the code in actual & current use: + + return unless m#GNUnet is free software: you can redistribute it and/or modify it#; + print STDERR "\nTrying $name\t"; + # There was a mistake in the replacement text! + return unless s#under the terms of the GNU General Public License as published#under the terms of the GNU Affero General Public License as published#; + print STDERR "FIXED"; +} + # We directly overwrite the original file in the # assumption that we're in a healthy revertible git. open(O, '>', $f) or die "Cannot overwrite $f"; |