Skip to content

Commit 8ceb6d9

Browse files
jherrera-jumpriptl
authored andcommitted
fdctl: allow --version flag
1 parent 9aba992 commit 8ceb6d9

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/app/shared/boot/fd_boot.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ fd_main( int argc,
212212

213213
action_t * action = NULL;
214214
for( ulong i=0UL; ACTIONS[ i ]; i++ ) {
215-
if( FD_UNLIKELY( !strcmp( argv[ 0 ], ACTIONS[ i ]->name ) ) ) {
215+
if( FD_UNLIKELY( !strcmp( argv[ 0 ], ACTIONS[ i ]->name ) ||
216+
(!strcmp( argv[ 0 ], "--version" ) && !strcmp( "version", ACTIONS[ i ]->name )) ||
217+
(!strcmp( argv[ 0 ], "--help" ) && !strcmp( "help", ACTIONS[ i ]->name ))
218+
) ) {
216219
action = ACTIONS[ i ];
217220
if( FD_UNLIKELY( action->is_immediate ) ) {
218221
action->fn( NULL, NULL );

src/app/shared/commands/help.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ help_cmd_fn( args_t * args FD_PARAM_UNUSED,
1616
FD_LOG_STDOUT(( "\nOPTIONS:\n" ));
1717
/* fdctl does not have many flag arguments so we hard-code the
1818
--config parameter. */
19-
FD_LOG_STDOUT(( " --config <PATH> Path to config TOML file\n\n" ));
19+
FD_LOG_STDOUT(( " --config <PATH> Path to config TOML file\n" ));
20+
FD_LOG_STDOUT(( " --version Show the current software version\n" ));
21+
FD_LOG_STDOUT(( " --help Print this help message\n\n" ));
2022
FD_LOG_STDOUT(( "SUBCOMMANDS:\n" ));
2123
for( ulong i=0UL; ACTIONS[ i ]; i++ ) {
22-
FD_LOG_STDOUT(( " %9s %s\n", ACTIONS[ i ]->name, ACTIONS[ i ]->description ));
24+
FD_LOG_STDOUT(( " %12s %s\n", ACTIONS[ i ]->name, ACTIONS[ i ]->description ));
2325
}
2426
}
2527

src/app/shared_dev/boot/fd_dev_boot.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ fd_dev_main( int argc,
7878
char const * log_path = fd_env_strip_cmdline_cstr( &argc, &argv, "--log-path", NULL, NULL );
7979

8080
const char * action_name = "dev";
81-
if( FD_UNLIKELY( argc > 0 && argv[ 0 ][ 0 ] != '-' ) ) {
81+
if( FD_LIKELY( argc > 0 && !strcmp( argv[ 0 ], "--version" ) ) ) {
82+
action_name = "version";
83+
argc--; argv++;
84+
} else if( FD_LIKELY( argc > 0 && !strcmp( argv[ 0 ], "--help" ) ) ) {
85+
action_name = "help";
86+
argc--; argv++;
87+
} else if( FD_UNLIKELY( argc > 0 && argv[ 0 ][ 0 ] != '-' ) ) {
8288
action_name = argv[ 0 ];
8389
argc--; argv++;
8490
}

0 commit comments

Comments
 (0)