Merge pull request #1155 from sjn/sjn-main-usage

Improve generate MAIN usage for rakudobrew
rakudo · Sep 13, 2017 · 7f0367b · 7f0367b
2 parents 80e069a + 76ccfd5
commit 7f0367b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/core/Main.pm b/src/core/Main.pm
@@ -92,10 +92,14 @@ my sub MAIN_HELPER($retval = 0) {
             # Not in PATH
             $name;
         }
+        my sub basename($name) { $*SPEC.splitpath($name)[2] }
 
         my $prog-name = %*ENV<PERL6_PROGRAM_NAME>:exists
           ?? %*ENV<PERL6_PROGRAM_NAME>
           !! $*PROGRAM-NAME;
+        my $prog-basename = $prog-name eq '-e'
+          ?? "-e '...'"
+          !! basename($prog-name);
         $prog-name = $prog-name eq '-e'
           ?? "-e '...'"
           !! strip_path_prefix($prog-name);
@@ -154,7 +158,7 @@ my sub MAIN_HELPER($retval = 0) {
             if $sub.WHY {
                 $docs = '-- ' ~ $sub.WHY.contents
             }
-            my $msg = join(' ', $prog-name, @required-named, @optional-named, @positional, $docs // '');
+            my $msg = join(' ', $prog-basename, @required-named, @optional-named, @positional, $docs // '');
             @help-msgs.push($msg);
         }
 
@@ -164,7 +168,7 @@ my sub MAIN_HELPER($retval = 0) {
             @help-msgs.append(@arg-help.map: { '  ' ~ .key ~ ' ' x ($offset - .key.chars) ~ .value });
         }
 
-        my $usage = "Usage:\n" ~ @help-msgs.map('  ' ~ *).join("\n");
+        my $usage = "Usage for {$prog-name}:\n" ~ @help-msgs.map('  ' ~ *).join("\n");
         $usage;
     }