userv: Provide interfaces to the new commands.

Annoyingly this involves adding a shell script wrapper to substitute
userv's environment variables in the right places.

diff --git a/.userv/rc b/.userv/rc
index f4a40f6f746e74f9233d3fee5bff1c49d4f81308..9549421bcee08172bb8168c28beca6822bf807c2 100644 (file)
--- a/.userv/rc
+++ b/.userv/rc
@@ -2,7 +2,22 @@
 
 if glob service generate
        no-suppress-args
 
 if glob service generate
        no-suppress-args

-       execute bin/cryptomail generate -f %@cryptomail.distorted.org.uk
+       execute bin/uwrap generate -f %@cryptomail.distorted.org.uk
+fi
+
+if glob service info
+       no-suppress-args
+       execute bin/uwrap info
+fi
+
+if glob service revoke
+       no-suppress-args
+       execute bin/uwrap revoke
+fi
+
+if glob service help
+       no-suppress-args
+       execute bin/uwrap help

 fi
 
 if ( glob service addrcheck:cryptomail-default
 fi
 
 if ( glob service addrcheck:cryptomail-default

diff --git a/bin/uwrap b/bin/uwrap
new file mode 100755 (executable)
index 0000000..9a2967b
--- /dev/null
+++ b/bin/uwrap
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+set -e
+exec bin/cryptomail -U "userv:$USERV_USER" "$@"