feat: replace /bin/bash with file basename (yargs#983)

jameswomack · Oct 17, 2017 · 20bb99b · 20bb99b
1 parent 5a9c986
commit 20bb99b
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 52 deletions.
diff --git a/lib/usage.js b/lib/usage.js
@@ -3,6 +3,7 @@
 // failures, etc. keeps logging in one place.
 const stringWidth = require('string-width')
 const objFilter = require('./obj-filter')
+const path = require('path')
 const setBlocking = require('set-blocking')
 const YError = require('./yerror')
 
@@ -165,7 +166,7 @@ module.exports = function usage (yargs, y18n) {
 
     // the usage string.
     if (usages.length && !usageDisabled) {
-      const u = self.getUsage().replace(/\$0/g, yargs.$0)
+      const u = self.getUsage().replace(/\$0/g, path.basename(yargs.$0))
       ui.div(`${u}`)
     }
 
@@ -275,7 +276,7 @@ module.exports = function usage (yargs, y18n) {
       ui.div(__('Examples:'))
 
       examples.forEach((example) => {
-        example[0] = example[0].replace(/\$0/g, yargs.$0)
+        example[0] = example[0].replace(/\$0/g, path.basename(yargs.$0))
       })
 
       examples.forEach((example) => {
@@ -304,7 +305,7 @@ module.exports = function usage (yargs, y18n) {
 
     // the usage string.
     if (epilog) {
-      const e = epilog.replace(/\$0/g, yargs.$0)
+      const e = epilog.replace(/\$0/g, path.basename(yargs.$0))
       ui.div(`${e}\n`)
     }
 

diff --git a/test/command.js b/test/command.js
@@ -532,7 +532,7 @@ describe('Command', () => {
       r.should.have.property('errors').with.length(0)
       r.should.have.property('logs')
       r.logs[0].split(/\n+/).should.deep.equal([
-        './command dream [command] [opts]',
+        'command dream [command] [opts]',
         'Commands:',
         '  of-memory <memory>               Dream about a specific memory',
         '  within-a-dream [command] [opts]  Dream within a dream',
@@ -604,7 +604,7 @@ describe('Command', () => {
       r.should.have.property('errors').with.length(0)
       r.should.have.property('logs')
       r.logs.join('\n').split(/\n+/).should.deep.equal([
-        './command cyclic',
+        'command cyclic',
         'Options:',
         '  --help     Show help  [boolean]',
         '  --version  Show version number  [boolean]',
@@ -674,7 +674,7 @@ describe('Command', () => {
           .argv, [ './command' ])
 
       const expectedCmd = [
-        './command cmd <sub>',
+        'command cmd <sub>',
         'Commands:',
         '  sub  Run the subcommand',
         'Options:',
@@ -684,7 +684,7 @@ describe('Command', () => {
       ]
 
       const expectedSub = [
-        './command cmd sub',
+        'command cmd sub',
         'Options:',
         '  --help     Show help  [boolean]',
         '  --version  Show version number  [boolean]',