From b14d2bd6ea799b80dd2ae1e0fecd8d8d4248155c Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Sat, 9 Apr 2016 04:54:56 -0500
Subject: [PATCH] Formatting fixes for credits

Contributed from jackal^, but fixed up a bit.
---
 CREDITS           | 27 ++++++++++++++-------------
 ircd/version.c.SH | 16 ++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/CREDITS b/CREDITS
index af2df0bea..58c1f5926 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,17 +1,18 @@
 Charybdis started as an evolution from ircd-ratbox. Its development
 is led by a team of dedicated developers who have put a lot of time
-into the project, and it has seen use on a variety of different
+into the project and it has seen use on a variety of different
 network configurations.
- 
-The charybdis core team is listed in nick-alphabetical order:
- 
+
+The Charybdis core team, listed in nick-alphabetical order:
+
 jilles, Jilles Tjoelker <jilles -at- stack.nl>
-mr_flea, Keith Buck <mr_flea -at- esper.net>
 kaniini, William Pitcock <nenolod -at- dereferenced.org>
+mr_flea, Keith Buck <mr_flea -at- esper.net>
 spb, Stephen Bennett <spb -at- attenuate.org>
- 
-The following people are also project members:
- 
+
+The following people are also project members, listed in nick-alphabetical
+order:
+
 amdj, Aaron Jones <aaronmdjones -at- gmail.com>
 Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
 grawity, Mantas Mikulėnas <grawity -at- gmail.com>
@@ -19,10 +20,10 @@ jdhore, JD Horelick <jdhore1 -at- gmail.com>
 lp0, Simon Arlott <simon -at- arlott.org>
 mniip <mniip -at- mniip.com>
 viatsko, Valerii Iatsko <dwr -at- codingbox.io>
- 
+
 The following people have made contributions to the Charybdis releases,
 in nick-alphabetical order:
- 
+
 AndroSyn, Aaron Sethman <androsyn -at- ratbox.org>
 anfl, Lee Hardy <lee -at- leeh.co.uk>
 beu, Elfyn McBratney <elfyn.mcbratney -at- gmail.com>
@@ -33,10 +34,10 @@ Taros, Brett Greenham <taros -at- shadowircd.net>
 ThaPrince, Jon Christopherson <jon -at- vile.com>
 twincest, River Tarnell <river -at- attenuate.org>
 w00t, Robin Burchell <surreal.w00t -at- gmail.com>
- 
+
 For a list of contributors to ircd-ratbox, ircd-hybrid, and ircd2.8 (the
 predecessors to Charybdis), see the doc/credits-past.txt file in the Charybdis
 distribution.
- 
-Visit the Charybdis website at: http://www.charybdis.io
+
+Visit the Charybdis website at: http://www.charybdis.io/
 Visit us on IRC at: irc.freenode.net #charybdis
diff --git a/ircd/version.c.SH b/ircd/version.c.SH
index ff055ffaa..fef9c2ece 100644
--- a/ircd/version.c.SH
+++ b/ircd/version.c.SH
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 spitshell=cat
-package=IRC
+package=charybdis
 
 echo "Extracting $package/src/version.c..."
 
@@ -27,7 +27,7 @@ fi
 
 $spitshell >version.c <<!SUB!THIS!
 /*
- *   IRC - Internet Relay Chat, src/version.c
+ *   $package - Internet Relay Chat, src/version.c
  *   Copyright (C) 1990 Chelsea Ashley Dyerman
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,7 @@ const char *infotext[] =
 {
   "$package --",
   "Based on the original code written by Jarkko Oikarinen",
-  "Copyright 1988, 1989, 1990, 1991 University of Oulu, Computing Center",
+  "Copyright (c) 1988-1991 University of Oulu, Computing Center",
   "Copyright (c) 1996-2001 Hybrid Development Team",
   "Copyright (c) 2002-2009 ircd-ratbox Development Team",
   "Copyright (c) 2005-2016 charybdis development team",
@@ -74,13 +74,9 @@ const char *infotext[] =
   " ",
 !SUB!THIS!
 
-IFS='
-'
-for i in `grep -v '^$Id' ../CREDITS |tr -d '"'` ; do
-echo "  \"$i\"," >> version.c
-done
+sed 's/^$/ /;s/.*/\  "&\",/' ../CREDITS >> version.c
 $spitshell >>version.c <<!SUB!THISTOO!
-  "",
-  0,
+  " ",
+  NULL,
 };
 !SUB!THISTOO!