diff --git a/.mailmap b/.mailmap deleted file mode 120000 index 060d08b1a..000000000 --- a/.mailmap +++ /dev/null @@ -1 +0,0 @@ -NICKS \ No newline at end of file diff --git a/AUTHORS b/AUTHORS index f1388a8d5..84cfe8304 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,7 +3,9 @@ # # Name Name Name (nickname) # -# The NICKS list is auto generated from this file. +# After changing this list, run "go run script/authors.go" to sort and update +# the GUI HTML. +# Aaron Bieber (qbit) Adam Piggott (ProactiveServices) diff --git a/NICKS b/NICKS deleted file mode 100644 index 7b0a988e7..000000000 --- a/NICKS +++ /dev/null @@ -1,153 +0,0 @@ -# This file maps email addresses used in commits to nicks used the changelog. -# It is auto generated from the AUTHORS file by script/authors.go. - -0x010C -0x010C -acogdev -adelq -adelq -alessandro.g89 -alex2108 -andersonvom -andrew-d -asdil12 -AudriusButkevicius -aviau -aviau -bencurthoys -benshep -bigbear2nd -brbecker -brendanlong -brgmnn -brgmnn -bsidhom -buinsky -burkemw3 -burkemw3 -calmh -calmh -canton7 -Cathryne -Cathryne -cdata -cdhowie -ceh -cqcallaw -damajor -dinosore -dsaveliev -dtchanpura -dtchanpura -dva -dzarda -eipiminus1 -eipiminus1 -elopio -facastagnini -filoozoom -frioux -frioux -fti7 -gillisig -hadogenes -imsodin -ironmig -jarlebring -jayachithra -jedie -jedie -jgke -jmdaweb -jmdaweb -jpjp -jpjp -kamadak -KayoticSully -kc1212 -kc1212 -kilburn -kluppy -kozec -kralo -kralo -krozycki -Kudalufi -Kudalufi -kwhite17 -letiemble -letiemble -liusy182 -liusy182 -lkwg82 -LordLandon -majedev -marcindziadus -marclaporte -marclaporte -mateon1 -mogwa1 -moshen -Moter8 -mpx -mvdan -nelsonkhan -Niller303 -Niller303 -norgeous -norgeous -norgeous -nov1n -nrm21 -Nutomic -pascalj -pascalj -peterhoeg -philips -piobpl -plouj -pluby -ProactiveServices -ProactiveServices -ProactiveServices -pyfisch -qbit -qepasa -ralder -rasa -Rewt0r -Rewt0r -rumpelsepp -rumpelsepp -sacheendra -scienmind -sciurius -seehuhn -Smiley73 -snnd -snugghash -snugghash -Stefan-Code -Stefan-Code -timabell -timhowes -tnn2 -tobiastom -tojrobinson -tpng -tylerbrazier -Unrud -Unrud -uok -uok -veeti -Vilbrekin -wkennington -WSGCSysadmin -wweich -wweich -wweich -xduugu -zaynetro -Zillode -zukoo diff --git a/script/authors.go b/script/authors.go index b59524103..9336861f7 100644 --- a/script/authors.go +++ b/script/authors.go @@ -36,11 +36,9 @@ const authorsHeader = `# This is the official list of Syncthing authors for copy # # Name Name Name (nickname) # -# The NICKS list is auto generated from this file. -` - -const nicksHeader = `# This file maps email addresses used in commits to nicks used the changelog. -# It is auto generated from the AUTHORS file by script/authors.go. +# After changing this list, run "go run script/authors.go" to sort and update +# the GUI HTML. +# ` type author struct { @@ -53,6 +51,9 @@ type author struct { func main() { authors := getAuthors() + + // Write author names in GUI about modal + getContributions(authors) sort.Sort(byContributions(authors)) @@ -78,6 +79,7 @@ func main() { if err != nil { log.Fatal(err) } + fmt.Fprintf(out, "%s\n", authorsHeader) for _, author := range authors { fmt.Fprintf(out, "%s", author.name) @@ -90,25 +92,6 @@ func main() { fmt.Fprintf(out, "\n") } out.Close() - - // Write NICKS file - - sort.Sort(byNick(authors)) - - out, err = os.Create("NICKS") - if err != nil { - log.Fatal(err) - } - fmt.Fprintf(out, "%s\n", nicksHeader) - for _, author := range authors { - if author.nickname == "" { - continue - } - for _, email := range author.emails { - fmt.Fprintf(out, "%s <%s>\n", author.nickname, email) - } - } - out.Close() } func getAuthors() []author { @@ -211,15 +194,3 @@ func (l byName) Less(a, b int) bool { } func (l byName) Swap(a, b int) { l[a], l[b] = l[b], l[a] } - -type byNick []author - -func (l byNick) Len() int { return len(l) } - -func (l byNick) Less(a, b int) bool { - anick := strings.ToLower(l[a].nickname) - bnick := strings.ToLower(l[b].nickname) - return anick < bnick -} - -func (l byNick) Swap(a, b int) { l[a], l[b] = l[b], l[a] }