From 1a7b46a229ed1654fab0ccef218be48a2f83a7cf Mon Sep 17 00:00:00 2001 From: hensm Date: Wed, 12 Aug 2020 10:50:58 +0100 Subject: [PATCH] Fix basename in bridge usage info --- app/bin/build.js | 4 ++-- app/src/main.ts | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/bin/build.js b/app/bin/build.js index c3365ee..35ec10c 100644 --- a/app/bin/build.js +++ b/app/bin/build.js @@ -159,7 +159,7 @@ async function build () { `@echo off setlocal set NODE_PATH=${modulesDir} - node %~dp0src\\main.js %* + node %~dp0src\\main.js --__name %~n0%~x0 %* endlocal `); break; @@ -170,7 +170,7 @@ endlocal launcherPath += ".sh"; fs.writeFileSync(launcherPath, `#!/usr/bin/env sh -NODE_PATH="${modulesDir}" node $(dirname $0)/src/main.js "$@" +NODE_PATH="${modulesDir}" node $(dirname $0)/src/main.js --__name $(basename $0) "$@" `); break; } diff --git a/app/src/main.ts b/app/src/main.ts index d70a0da..c32673a 100644 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -6,7 +6,7 @@ import minimist from "minimist"; const argv = minimist(process.argv.slice(2), { boolean: [ "daemon", "help", "version" ] - , string: [ "port" ] + , string: [ "__name", "port" ] , alias: { d: "daemon" , h: "help" @@ -14,7 +14,8 @@ const argv = minimist(process.argv.slice(2), { , p: "port" } , default: { - daemon: false + __name: path.basename(process.argv[0]) + , daemon: false , port: "9556" } }); @@ -25,7 +26,7 @@ if (argv.version) { console.log(`v0.0.7`); } else if (argv.help) { console.log( -`Usage: ${path.basename(process.argv[0])} [options] +`Usage: ${argv.__name} [options] Options: -h, --help Print usage info