From: Philipp Takacs <philipp@bureaucracy.de>
Date: Sat, 5 Jan 2019 19:35:50 +0000 (+0100)
Subject: depricate whatnow
X-Git-Tag: mmh-0.4~4
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=a859462824cb481880506c394704a0b5a4b9fc2d;p=mmh

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 d0fea84..4fa2b34 100644
--- 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 82b25c6..2b6847f 100644
--- 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 44fecb6..05bbd76 100644
--- 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 15d0824..474b505 100644
--- 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 be046ac..41c8733 100644
--- 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;