Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-03-28 11:20:18 -0400
committerDan McGee <dan@archlinux.org>2007-03-28 16:26:37 -0400
commit3ef1aeb8bdc5bcda64e4d827aa01761848f2041f (patch)
tree5be009c3e2b4d0e7e5ea273f37e21796dd2edfc9
parent4a0aac3862acda7d3e42362ffc95d27b9d84f0cb (diff)
Continue fixing usage instructions.
* Unify the main usage instructions to look a bit more like the rest with a usage and options line. * Fix some of the spacing from the de-gettexting done yesterday. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/pacman.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index f8582753..c586aebe 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -93,9 +93,11 @@ static void usage(int op, char *myname)
char * const str_file = _("file");
char * const str_pkg = _("package");
char * const str_usg = _("usage");
+ char * const str_opr = _("operation");
if(op == PM_OP_MAIN) {
- printf("%s:", str_usg);
+ printf("%s: %s <%s> [...]\n", str_usg, myname, str_opr);
+ printf("%s:\n", str_opt);
printf(" %s {-h --help}\n", myname);
printf(" %s {-V --version}\n", myname);
printf(" %s {-A --add} [%s] <%s>\n", myname, str_opt, str_file);
@@ -112,7 +114,7 @@ static void usage(int op, char *myname)
printf(_(" -d, --nodeps skip dependency checks\n"));
printf(_(" -f, --force force install, overwrite conflicting files\n"));
} else if(op == PM_OP_REMOVE) {
- printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg);
+ printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg);
printf(_("usage: %s {-R --remove} [options] <package>\n"), myname);
printf("%s:\n", str_opt);
printf(_(" -c, --cascade remove packages and all packages that depend on them\n"));
@@ -130,7 +132,7 @@ static void usage(int op, char *myname)
printf(_(" -d, --nodeps skip dependency checks\n"));
printf(_(" -f, --force force install, overwrite conflicting files\n"));
} else if(op == PM_OP_QUERY) {
- printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
+ printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
printf("%s:\n", str_opt);
printf(_(" -c, --changelog view the changelog of a package\n"));
printf(_(" -e, --orphans list all packages installed as dependencies but no longer\n"
@@ -144,7 +146,7 @@ static void usage(int op, char *myname)
printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n"));
printf(_(" -u, --upgrades list all packages that can be upgraded\n"));
} else if(op == PM_OP_SYNC) {
- printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
+ printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
printf("%s:\n", str_opt);
printf(_(" -c, --clean remove old packages from cache directory (-cc for all)\n"));
printf(_(" -d, --nodeps skip dependency checks\n"));