sbrun: clean up help output.

1 files changed, 17 insertions, 13 deletions

diff --git a/sbrun b/sbrun
index 0175834..99c36a9 100755
--- a/sbrun
+++ b/sbrun
@@ -214,18 +214,18 @@ for building dependencies maintained by other people, not my own stuff.
 Basically, sbrun started out as a lazy typist's tool, and grew into
 something more generally useful. It's lower-level than sbotools or sbopkg,
 but more convenient than just executing ./*.SlackBuild. It requires no
-initial setup or configuration (it's a self-contained shell script),
-except you have to install trackfs.
+initial setup or configuration (it's a self-contained shell script).
 
 Since it's *not* intended to replace sbotools or sbopkg, sbrun doesn't
 do any of these things:
 
 - download source files (though it will call 'sbodl' with the -d option).
 - check source file md5sums.
-- allow building multiple packages at once (queue files).
+- allow building multiple packages at once (queue files), though it
+  will call 'sbqrun' with the -q/-Q options (and sbqrun calls sbrun
+  for each dependency).
 - install/upgrade/remove packages (it *just* builds them, though it will
   call 'upkg' with the -i option).
-- dependency resolution.
 - sync the repo, or even have any concept of a repo (it only deals
   with a single SlackBuild script, in the current directory).
 - anything to do with .info files. Nothing about sbrun is SBo-specific,
@@ -234,8 +234,8 @@ do any of these things:
 
 Finally, a helpful hint: If you use git to push to SBo, you can't
 add anything to .gitignore since it's tracked by git. But you can
-use .git/info/exclude for the same purpose. Add build.log and maybe
-strace.out there.
+use .git/info/exclude for the same purpose. Add build.log* and
+strace.out there, to avoid git complaining about them being untracked.
 EOF
 }
 
@@ -252,15 +252,19 @@ under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 Usage: $SELF [-option [-option ...]] [script] [variable=value ...]
 
+-c     Clean up (remove) source and package dirs after build completes.
+-d     Download sources with 'sbodl'.
+-D     Use distcc (enables -n, sets CC/CXX; set DISTCC_HOSTS yourself).
+-I     Run an interactive shell in the source directory.
+-i     Install built package with 'upkg'.
 -jN    Run N make jobs in parallel.
+-l     Lint the package with 'sbopkglint'.
 -n     Allow the SlackBuild to access the network.
+-p     Run an interactive shell in the \$PKG directory.
+-Q     Build and install all deps first.
+-q     Build and install deps first (skip installed deps).
 -s     Run the script with strace -f, output in "strace.out".
 -x     Run the script with "sh -x", enables shell command tracing.
--c     Clean up (remove) source and package dirs after build completes.
--I     Run an interactive shell in the source directory.
--p     Run an interactive shell in the \$PKG directory.
--i     Install built package with 'upkg'.
--d     Download sources with 'sbodl'.
 -h, --help
        Show short usage message (you're reading it now) and exit.
 -H, --long-help
@@ -398,7 +402,7 @@ fi
 CMD="$0 $*"
 
 # parse -options
-OPTS="$( getopt -n $SELF -olj:nsxcIpDidqQhH -l help -- "$@" )"
+OPTS="$( getopt -n $SELF -olj:nsxcIpDidqQhH -- "$@" )"
 if [ "$?" != "0" ]; then
   show_help
   exit 1
@@ -423,7 +427,7 @@ while true; do
 		-d)               SBODL=yes               ;;
 		-q)               run_queue               ;;
 		-Q)               run_queue -i            ;;
-		-h|-help|--help)  show_help ; exit 0      ;;
+		-h)               show_help ; exit 0      ;;
 		-H)               long_help ; exit 0      ;;
 		--)               shift ; break           ;;
 		*)                show_help "$1"; exit 1  ;; # never happens?