Updated command usage

diff --git a/bex b/bex
index ac895126f90e01decac80099d5dbf1a9e970fadd..faf9de71ef1451b96195d13713c8b8884411a00b 100755 (executable)
--- a/bex
+++ b/bex
@@ -14,7 +14,21 @@ GetOptions(
        "home=s" => \$bex_home,
        "lib=s" => \$bex_lib,
        "help" => sub {
-                       print "Usage: brum\n";
+                       print <<AMEN ;
+Usage: bex <general-options> <command> <command-options> <args>
+
+General options:
+--home=<dir>   Home directory where all queues and config files reside
+--lib=<dir>    Directory where BEX modules are installed
+
+Commands (and aliases):
+add (a)                Add new jobs to a queue
+job            Operations on queued jobs
+ls             List known machines and groups
+prun (pr)      Parallel version of `run'
+queue (q)      Show queues and jobs
+run (r)                Run queued jobs
+AMEN
                        exit 0;
                },
        "version" => sub {
@@ -36,6 +50,7 @@ $sub =~ /^[0-9a-zA-Z]+$/ or die "Invalid subcommand $sub\n";
 
 my %aliases = (
        'a' => 'add',
+       'p' => 'prun',
        'q' => 'queue',
        'r' => 'run',
 );

diff --git a/lib/bin/add b/lib/bin/add
index 95fbbb8e43aa216b3be97b8ee8032892614813bb..7483ea806a07c42a73de9aeb0016ec80e41e947e 100755 (executable)
--- a/lib/bin/add
+++ b/lib/bin/add
@@ -25,7 +25,7 @@ GetOptions(
        "s|subject=s" => \$given_subject,
        "t|template=s" => \$given_template,
 ) or die <<AMEN ;
-Usage: benq [<options>] [!]<machine-or-class> ...
+Usage: bex add [<options>] [!]<machine-or-class> ...
 
 Options:
 -b, --body=<file>      Load job body from the given file

diff --git a/lib/bin/job b/lib/bin/job
index 133ab999aaa13bd988309c011db5fbf73fc9a717..11e8e116dcf54847325f44b3ab5c7b5fe9bc5dd9 100755 (executable)
--- a/lib/bin/job
+++ b/lib/bin/job
@@ -14,7 +14,7 @@ GetOptions(
        "e|edit!" => \$edit,
        "q|queue=s" => \$queue_name,
 ) && @ARGV == 1 or die <<AMEN ;
-Usage: bjob [<options>] <job-id>
+Usage: bex job [<options>] <job-id>
 
 Options:
 -e, --edit             Run editor on the given job (no locking)

diff --git a/lib/bin/ls b/lib/bin/ls
index e57205727cbc0cb1c894da1136e92a4c1908ce3b..542835cbe7376af8f51a139c3531bb6f46e1738e 100755 (executable)
--- a/lib/bin/ls
+++ b/lib/bin/ls
@@ -12,7 +12,7 @@ my $queue_name;
 
 GetOptions(
 ) && @ARGV == 0 or die <<AMEN ;
-Usage: bjob [<options>]
+Usage: bex job [<options>]
 
 Options:
 None defined so far.

diff --git a/lib/bin/prun b/lib/bin/prun
index 8a0455931344478e65822ece874655838fe5c866..ba17cd41d169310aefe4508a106ae58ba783e863 100755 (executable)
--- a/lib/bin/prun
+++ b/lib/bin/prun
@@ -18,7 +18,7 @@ GetOptions(
        "session=s" => \$screen_session,
        "text!" => \$text_mode,
 ) or die <<AMEN ;
-Usage: bprun [<options>] [[!]<machine-or-class> ...]
+Usage: bex prun [<options>] [[!]<machine-or-class> ...]
 
 Options:
 -q, --queue=<name>     Run jobs in the given queue

diff --git a/lib/bin/queue b/lib/bin/queue
index aec067d110388d5e724504ed3091d96c53ac8e23..239951945230fd607e91e309a79acee0c8a2d527 100755 (executable)
--- a/lib/bin/queue
+++ b/lib/bin/queue
@@ -24,7 +24,7 @@ GetOptions(
        "j|job=s" => \$given_job,
        "q|queue=s" => \$queue_name,
 ) or die <<AMEN ;
-Usage: bq [<options and actions>] [[!]<machine-or-class> ...]
+Usage: bex queue [<options and actions>] [[!]<machine-or-class> ...]
 
 Actions:
     --by-job           Show jobs sorted by job ID (default)

diff --git a/lib/bin/run b/lib/bin/run
index eb54c9a172b688e0b00f39c2b36ced3cc0e75503..f90c96f78ffa34b9336e632852c3034f2c33af35 100755 (executable)
--- a/lib/bin/run
+++ b/lib/bin/run
@@ -16,7 +16,7 @@ GetOptions(
        "q|queue=s" => \$queue_name,
        "s|status-fifo=s" => \$status_fifo,
 ) or die <<AMEN ;
-Usage: brun [<options>] [[!]<machine-or-class> ...]
+Usage: bex run [<options>] [[!]<machine-or-class> ...]
 
 Options:
 -j, --job=<id>         Run only the specified job