From 17d274ef48d22e17da96f52f87a60c962dd784aa Mon Sep 17 00:00:00 2001
From: Andrew <kyboren@riseup.net>
Date: Fri, 19 Feb 2016 18:17:40 +0100
Subject: [PATCH] Move usage information printing to separate function, and
 print usage to stderr; also added some spacing.

---
 qubes-rpc/qvm-run | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qubes-rpc/qvm-run b/qubes-rpc/qvm-run
index f41104c..0997e61 100755
--- a/qubes-rpc/qvm-run
+++ b/qubes-rpc/qvm-run
@@ -20,8 +20,8 @@
 #
 #
 
-if [ $# -lt 2 ] ; then
-    cat <<USAGE
+function print_usage(){
+cat >&2 <<USAGE
 Usage: $0 vmname command arguments
 Executes a command in another VM using the qubes.VMShell RPC service.  The
 arguments are joined with spaces and passed to "bash -c".
@@ -33,10 +33,16 @@ is your terminal.
 
 You can use \$dispvm or --dispvm instead of vmname to start a new DisposableVM.
 USAGE
+}
+
+if [ $# -lt 2 ] ; then
+    print_usage
     exit 1
 fi
+
 VMNAME=$1
 shift
+
 if [ $VMNAME = "--dispvm" ] ; then
     VMNAME='$dispvm'
 fi