From 6676aa71859641eaf7dcfb309200837c93510d51 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 19:44:48 -0600
Subject: xbs: Clean up the usage text.

---
 src/xbs/xbs | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/xbs/xbs b/src/xbs/xbs
index 8bd3bdf..4691146 100755
--- a/src/xbs/xbs
+++ b/src/xbs/xbs
@@ -34,7 +34,8 @@ usage() {
 	print 'Usage: %s [-b BUILDSYSTEM|-h] COMMAND [ARGUMENTS]' "${0##*/}"
 	print 'Tool for working with arbitrary ABS-like build systems'
 	echo
-	prose 'This is a pluggable tool. The BUILDSYSTEM it uses is configured in:'
+	prose 'This is a pluggable tool. The BUILDSYSTEM it uses is configured
+	       in:'
 	bullet '/etc/xbs.conf'
 	bullet '${XDG_CONFIG_HOME}/xbs.conf'
 	bullet 'with the `-b` flag'
@@ -46,23 +47,27 @@ usage() {
 	echo
 	print 'Options:'
 	flag "-b $(_ BUILDSYSTEM)" 'Use BUILDSYSTEM instead of the one
-	                            configured in xbs.conf'
-	flag '-h'                  'Show this message'
+	                            configured in xbs.conf' \
+	     '-h'                  'Show this message'
+	echo
+	prose "Whether a command is intended for use on a developer's box or on
+	       the server is indicated by (dev), (srv), or (any) before the
+	       command"
 	echo
 	print 'Commands:'
-	flag 'status' \
-		'Are there uncommitted changes in `.`?'
-	flag 'download' \
-		'Download or update the tree'
-	flag "release-client $(_ 'REPO ARCH')" \
-		'Release `.` (for developer boxes)'
-	flag "release-server $(_ 'REPO ARCH')" \
-		'Release `.` (for server boxes)'
-	flag "unrelease $(_ 'PKGBASE REPO ARCH')" \
-		'Unrelease a pkgbase'
-	flag "move $(_ 'FROMREPO TOREPO PKGBASE')" \
-		'Move a pkgbase from one repo to another'
-	flag "releasepath $(_ 'PKGBASE REPO ARCH')" \
+	flag "$(_ '(dev) status')" \
+		'Are there uncommitted changes in `.`?' \
+	     "$(_ '(dev) download')" \
+		'Download or update the tree' \
+	     "$(_ '(dev) release-client REPO ARCH')" \
+		'Release `.` (for developer boxes)' \
+	     "$(_ '(srv) release-server REPO ARCH')" \
+		'Release `.` (for server boxes)' \
+	     "$(_ '(srv) unrelease PKGBASE REPO ARCH')" \
+		'Unrelease a pkgbase' \
+	     "$(_ '(srv) move FROMREPO TOREPO PKGBASE')" \
+		'Move a pkgbase from one repo to another' \
+	     "$(_ '(srv) releasepath PKGBASE REPO ARCH')" \
 		'Print the path to the staged version of pkgbase, or exit with
 		 non-zero if not released'
 }
-- 
cgit v1.2.3