depricate whatnow

Now a depricated warning is printed at the usage of whatnow.
Also add a BUG section to the manpage.

diff --git a/man/whatnow.man1 b/man/whatnow.man1
index d0fea84e63591d45ca524ec7d5bca2f95ede3ce6..4fa2b34c5dca6a0fa4683e595f5b87330019573c 100644 (file)
--- a/man/whatnow.man1
+++ b/man/whatnow.man1
@@ -154,12 +154,17 @@ information.
 .fi
 
 .SH "SEE ALSO"
-send(1)
+send(1), whatnow2(1)
 
 .SH DEFAULTS
 .nf
 .RB ` \-prompt "' defaults to `What\ Now?\ '"
 .fi
 
+.SH "BUGS"
+.B whatnow
+is deprecated an will be removed in the next release.
+Consider switching to whatnow2(1).
+
 .SH CONTEXT
 None

diff --git a/test/tests/whatnow/test-attach-detach b/test/tests/whatnow/test-attach-detach
index 82b25c695276884043b0364a3361f900ae65cc3a..2b6847fcd81593897df187fe566531d58ad016ad 100644 (file)
--- a/test/tests/whatnow/test-attach-detach
+++ b/test/tests/whatnow/test-attach-detach
@@ -27,6 +27,13 @@ cat > $expected <<EOF
 1      /XXX/baz's boz
 EOF
 
+cat > $expectederr <<EOF
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
+EOF
+
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach baz\\'s\\ boz" | whatnow -editor true -prompt '' 2>> $actualerr >> $actual

diff --git a/test/tests/whatnow/test-cd b/test/tests/whatnow/test-cd
index 44fecb6cf8c343d018afaf137fd7225b9cac8571..05bbd7606f048f284512bef9c47c05ecf89481b9 100644 (file)
--- a/test/tests/whatnow/test-cd
+++ b/test/tests/whatnow/test-cd
@@ -24,6 +24,7 @@ $SPDIR
 EOF
 
 cat > $expectederr <<EOF
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
 EOF
 
 # create a draft message

diff --git a/test/tests/whatnow/test-ls b/test/tests/whatnow/test-ls
index 15d0824afc485e9fdf07c8fd8d318063c5412db4..474b505b17eb633e880d010d90860df67aec74c9 100644 (file)
--- a/test/tests/whatnow/test-ls
+++ b/test/tests/whatnow/test-ls
@@ -24,6 +24,7 @@ boz
 EOF
 
 cat > $expectederr <<EOF
+whatnow: whatnow is deprecated. Consider switching to whatnow2.
 EOF
 
 # create a draft message

diff --git a/uip/whatnow.c b/uip/whatnow.c
index be046ac79f632fadc3dfb6838abab206988ed4c7..41c8733c2daff7a1fbabed8ec53c6a97489124fc 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -104,6 +104,8 @@ main(int argc, char **argv)
        /* read user profile/context */
        context_read();
 
+       advise(NULL, "whatnow is deprecated. Consider switching to whatnow2.");
+
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;