Added some basic sanity checks to the commit script that now makes

 sure we at least attempt to keep copyright dates updated whenever we
 make changes.

diff --git a/ChangeLog b/ChangeLog
index 93e45221b097e528df17805316e127f9cc779d7f..6d804f360626552398e690f209a7eb9950a4318b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-01  Markus Gutschke  <markus@shellinabox.com>
+
+       * Added some basic sanity checks to the commit script that now makes
+       sure we at least attempt to keep copyright dates updated whenever we
+       make changes.
+
 2009-11-29  Markus Gutschke  <markus@shellinabox.com>
 
        * Preparations for packaging ShellInABox in a way that makes it

diff --git a/commit b/commit
index 022fb5406a770849c343f2c1a2c51d4ac3739b44..0ea86847c0e6ab9d9e40b310bd9b066dda1e1b43 100755 (executable)
--- a/commit
+++ b/commit
@@ -125,9 +125,35 @@ svn update
 # Update "configure.ac" with the next Subversion revision number. This
 # information will trickle down into various source files where it becomes
 # part of the user-visible version information.
-sed -ie 's/^\(VCS_REVISION=\).*/\1'"${rev}"'/' configure.ac
+sed -i -e 's/^\(VCS_REVISION=\).*/\1'"${rev}"'/' configure.ac
 touch shellinabox/vt100.jspp shellinabox/shell_in_a_box.jspp
 
+# If the manual page has been changed, make sure that the time stamp will be
+# changed, too.
+if [ -n "$(svn st shellinabox/shellinaboxd.man.in 2>/dev/null |
+           grep '^M')" ]; then
+  sed -i -e 's/^\([.]TH .*\)"[^"]*"/\1"'"$(date +'%b %d, %Y')"'"/
+             s/2008-2[01][0-9][0-9]/2008-'"$(date +'%Y')"'/g'                 \
+      shellinabox/shellinaboxd.man.in
+fi
+
+# Always update the year in the user visible copyright statement(s)
+for i in shellinabox/shell_in_a_box.jspp                                      \
+         shellinabox/vt100.jspp                                               \
+         COPYING                                                              \
+         debian/copyright; do
+  sed -i -e 's/\(2[01][0-9][0-9]-\)2[01][0-9][0-9]/\1'"$(date +'%Y')"'/g' "$i"
+done
+
+# If a source file has changed, make sure to update the year in the copyright
+# statement for that particular file.
+svn st | egrep '^[MA]' | awk '{ print $2 }' |
+  egrep '^(shellinabox|libhttp|demo)/' |
+  egrep '[.](html|h|c|css|jspp)$' |
+  while read -r f; do
+   sed -i -e 's/\(2[01][0-9][0-9]-\)2[01][0-9][0-9]/\1'"$(date +'%Y')"'/g' "$f"
+  done
+
 # For now, Ubuntu/Hardy is still quite popular. We want to make it easy for
 # our users to build Debian packages from source. So, make sure we lock the
 # compatibility level at 6. Once we no longer care about maintaining strict

diff --git a/config.h b/config.h
index ee99d85bb36070657e530117abb544fa40aa8c78..e627a2deadbecf8a4b0c9eaaaed2cdadde664023 100644 (file)
--- a/config.h
+++ b/config.h
@@ -138,7 +138,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "192"
+#define VCS_REVISION "193"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index 97c9da8389358be239aa30e83088094ddd0865e1..ebf45ad61e59cf2fbb2805a60dce981359c214e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=192
+VCS_REVISION=193
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index f469a1e5aa35272c83ac85e80889e9bef9d5a7ee..fe8cba1ce1795e3b1d9b548d58db9a0f9a01bfbe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
-VCS_REVISION=192
+VCS_REVISION=193
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/demo/vt100.js b/demo/vt100.js
index 2763b226ed725e51c354d812bf1c083186336a9e..485ccefa063cb74be6d1363870d317c3537d684c 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 192)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 193)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index d2fb11e300cddaa842aafbf5a2f6a3170504f368..034aef9c22e8dd18b2e664b307da312c6b396247 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.10 (revision 192)" +
+  alert("Shell In A Box version " + "2.10 (revision 193)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 2763b226ed725e51c354d812bf1c083186336a9e..485ccefa063cb74be6d1363870d317c3537d684c 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 192)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 193)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };