Maint: mkdir -p

[bex.git] / bex

diff --git a/bex b/bex
index ac895126f90e01decac80099d5dbf1a9e970fadd..f4db56f0fe90b25751ece0ef953eb50cfa3f3caa 100755 (executable)
--- a/bex
+++ b/bex
@@ -9,18 +9,36 @@ use Getopt::Long;
 my $bex_home = $ENV{"BEX_HOME"} // ".";
 my $bex_lib = $ENV{"BEX_LIB"} // "lib";
 
+sub show_help() {
+       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
+help           Show this help
+job            Operations on queued jobs
+mach           List known machines and groups
+prun (pr)      Parallel version of `run'
+qman           Management of queues
+queue (q)      Show queues and jobs on them
+run (r)                Run queued jobs
+AMEN
+       exit 0;
+}
+
 Getopt::Long::Configure('require_order');
 GetOptions(
        "home=s" => \$bex_home,
        "lib=s" => \$bex_lib,
-       "help" => sub {
-                       print "Usage: brum\n";
-                       exit 0;
-               },
+       "help" => \&show_help,
        "version" => sub {
                        print "BEX 3.0 (c) 2011-2012 Martin Mares <mj\@ucw.cz>\n";
                },
-) or die "Try `bex --help' for more information.\n";
+) or die "Try `bex help' for more information.\n";
 Getopt::Long::Configure('default');
 
 if (!-d $bex_home) {
@@ -29,19 +47,25 @@ if (!-d $bex_home) {
 if (!-d "$bex_home/BEX") {
        die "BEX home directory $bex_home does not contain the BEX subdirectory.\n";
 }
+if (!-f "$bex_lib/perl/BEX.pm") {
+       die "BEX library directory $bex_lib misconfigured.\n";
+}
 
 @ARGV or die "Missing subcommand.\n";
 my $sub = shift @ARGV;
 $sub =~ /^[0-9a-zA-Z]+$/ or die "Invalid subcommand $sub\n";
 
+if ($sub eq 'help') { show_help(); }
+
 my %aliases = (
        'a' => 'add',
+       'p' => 'prun',
        'q' => 'queue',
        'r' => 'run',
 );
 if (defined $aliases{$sub}) { $sub = $aliases{$sub}; }
 
-my $sub_path = "$bex_lib/bin/$sub";
+my $sub_path = "$bex_lib/bin/bex-$sub";
 -x $sub_path or die "Unknown subcommand $sub\n";
 
 $ENV{"BEX_HOME"} = $bex_home;