Skip to content

Commit 619e5e2

Browse files
authored
Merge pull request #1191 from xexyl/usage
Improve mkiocccentry usage string
2 parents 2492421 + 39dda06 commit 619e5e2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ defeat the purpose of the answers file). The use of `-Y` is highly discouraged
2727
unless you are **certain** you're good to go and it is mostly used for
2828
`mkiocccentry_test.sh` which needs to be non-interactive.
2929

30+
Improve usage string about `workdir` and `topdir` to make certain things a bit
31+
clearer.
32+
3033
Updated `MKIOCCCENTRY_VERSION` to `"1.2.35 2025-02-27"`.
3134
Updated `MKIOCCCENTRY_TEST_VERSION` to` "1.0.15 2025-02-26"`.
3235

mkiocccentry.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static const char * const usage_msg1 =
131131
"\t-t tar\t\tpath to tar(1) that supports the -J (xz) option (def: %s)\n"
132132
"\t-l ls\t\tpath to ls(1) (def: %s)\n"
133133
"\t-T txzchk\tpath to txzchk(1) (def: %s)\n"
134-
"\t-e\t\tentertainment mode\n"
134+
"\t-e\t\tentertainment mode (for txzchk)\n"
135135
"\t-f feathers\tdefine how many feathers is feathery (for -e)\n"
136136
"\t-F fnamchk\tpath to fnamchk(1) (used by txzchk) (def: %s)";
137137
static const char * const usage_msg2 =
@@ -152,8 +152,9 @@ static const char * const usage_msg3 =
152152
"\t\t\t NOTE: you can ignore more than one file or directory with multiple -I args\n";
153153
static const char * const usage_msg4 =
154154
"\tworkdir\t\tdirectory where the submission directory and tarball are formed\n"
155+
"\t\t\t NOTE: the submission directory under this directory must NOT exist\n"
155156
"\ttopdir\t\tdirectory with required, optional and extra files and/or directories\n"
156-
"\t\t\t to be copied to tarball\n";
157+
"\t\t\t NOTE: the topdir MUST have your prog.c, Makefile and remarks.md\n";
157158
static const char * const usage_msg5 =
158159
"\n"
159160
"Exit codes:\n"

0 commit comments

Comments
 (0)