fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change -C and -D long option names

Browse Source 
The config dir long option has been changed from --conf to --confdir.
The data dir long option has been changed from --directory to --datadir.

Both old options are kept for backward compatibility but are removed
from the manual.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
vxid 2019-03-13 15:47:22 +01:00 committed by Lukas Fleischer
parent ccdd3391f3
commit 2c50f0700a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/calcurse.1.txt
View File

@ -42,7 +42,7 @@ SYNOPSIS
-------- --------
-- --
*calcurse* [-D 'directory'] [-C 'confdir'] [-c 'calendar-file'] *calcurse* [-D 'datadir'] [-C 'confdir'] [-c 'calendar-file']
*calcurse* -Q [*--from* 'date'] [*--to* 'date' | *--days* 'number'] *calcurse* -Q [*--from* 'date'] [*--to* 'date' | *--days* 'number']
@ -147,12 +147,12 @@ are marked "('also interactively')".
absolute path name, it is interpreted relative to the current working absolute path name, it is interpreted relative to the current working
directory. The option has precedence over *-D*. directory. The option has precedence over *-D*.
*-C* 'dir', *--conf* 'dir':: *-C* 'dir', *--confdir* 'dir'::
('also interactively') Specify the configuration directory to use. If not ('also interactively') Specify the configuration directory to use. If not
specified, the default directory is *~/.calcurse/*. See <<_files,FILES>> for specified, the default directory is *~/.calcurse/*. See <<_files,FILES>> for
the interaction with *-D*. the interaction with *-D*.
*-D* 'dir', *--directory* 'dir':: *-D* 'dir', *--datadir* 'dir'::
('also interactively') Specify the (data) directory to use. If not specified, ('also interactively') Specify the (data) directory to use. If not specified,
the default directory is *~/.calcurse/*. See section <<_files,FILES>> for the default directory is *~/.calcurse/*. See section <<_files,FILES>> for
the interaction with *-C*. the interaction with *-C*.
@ -654,7 +654,7 @@ An alternative calendar file may be specified with the *-c* option.
Configuration files Configuration files
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
The +conf+ file contains the user configuration and the +keys+ file The +conf+ file contains the user configuration and the +keys+ file
the user-defined key bindings. The +hooks+ directory contains user-supplied the user-defined key bindings. The +hooks+ directory contains user-supplied
scripts, see <<_hooks,Hooks>>. scripts, see <<_hooks,Hooks>>.

8
src/args.c
View File

@ -143,9 +143,9 @@ static void help_arg(void)
putchar('\n'); putchar('\n');
printf("%s\n", _("Miscellaneous:")); printf("%s\n", _("Miscellaneous:"));
printf("%s\n", _(" -c, --calendar <file> The calendar data file to use")); printf("%s\n", _(" -c, --calendar <file> The calendar data file to use"));
printf("%s\n", _(" -C, --conf <directory> The configuration directory to use")); printf("%s\n", _(" -C, --confdir <dir> The configuration directory to use"));
printf("%s\n", _(" --daemon Run notification daemon in the background")); printf("%s\n", _(" --daemon Run notification daemon in the background"));
printf("%s\n", _(" -D, --directory <dir> The data directory to use")); printf("%s\n", _(" -D, --datadir <dir> The data directory to use"));
printf("%s\n", _(" -g, --gc Run the garbage collector")); printf("%s\n", _(" -g, --gc Run the garbage collector"));
printf("%s\n", _(" -h, --help Show this help text")); printf("%s\n", _(" -h, --help Show this help text"));
printf("%s\n", _(" -i, --import <file> Import iCal data from file")); printf("%s\n", _(" -i, --import <file> Import iCal data from file"));
@ -436,8 +436,12 @@ int parse_args(int argc, char **argv)
struct option longopts[] = { struct option longopts[] = {
{"appointment", no_argument, NULL, 'a'}, {"appointment", no_argument, NULL, 'a'},
{"calendar", required_argument, NULL, 'c'}, {"calendar", required_argument, NULL, 'c'},
/* Deprecated */
{"conf", required_argument, NULL, 'C'}, {"conf", required_argument, NULL, 'C'},
{"confdir", required_argument, NULL, 'C'},
{"day", required_argument, NULL, 'd'}, {"day", required_argument, NULL, 'd'},
{"datadir", required_argument, NULL, 'D'},
/* Deprecated */
{"directory", required_argument, NULL, 'D'}, {"directory", required_argument, NULL, 'D'},
{"filter", no_argument, NULL, 'F'}, {"filter", no_argument, NULL, 'F'},
{"gc", no_argument, NULL, 'g'}, {"gc", no_argument, NULL, 'g'},