summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2011-07-15 23:16:44 +0000
committerJason Woodward2011-07-15 23:16:44 +0000
commit188139782f8c03b0801af0862350292b16569c18 (patch)
treeabe83624260d42323625b9b9657b191b46ad274a
parent8655f00e73909a9c59f9d96b36da458b01f2207a (diff)
downloadslapt-get-0.10.2j.tar.gz
updated --help output (inspired by slapt-src suggestions from Igor)0.10.2j
-rw-r--r--ChangeLog1
-rw-r--r--src/main.c54
2 files changed, 28 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 6daef9c..6c6f2cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.10.2j Jul 15, 2011
+ * updated --help output (inspired by Igor's slapt-src suggestions)
* make sure to remove the conflict's dependencies as well as the conflict
* Updated regex for reading /var/log/packages compressed and uncompressed sizes
* free regex and installed package list in slapt_pkg_action_filelist
diff --git a/src/main.c b/src/main.c
index 57fdcd3..b4e3569 100644
--- a/src/main.c
+++ b/src/main.c
@@ -432,42 +432,42 @@ void usage(void)
printf(gettext("%s [option(s)] [target]\n"),PACKAGE);
printf("\n");
printf(gettext("Targets:\n"));
- printf(" --update|-u - %s\n",gettext("retrieve pkg data from MIRROR"));
- printf(" --upgrade - %s\n",gettext("upgrade installed pkgs"));
- printf(" --dist-upgrade - %s\n",gettext("upgrade to newer release"));
- printf(" --install|-i %s\n",gettext("[pkg name(s)] - install specified pkg(s)"));
+ printf(" -u, --update %s\n",gettext("retrieve pkg data from MIRROR"));
+ printf(" --upgrade %s\n",gettext("upgrade installed pkgs"));
+ printf(" --dist-upgrade %s\n",gettext("upgrade to newer release"));
+ printf(" -i, --install %s\n",gettext("[pkg name(s)] - install specified pkg(s)"));
printf(" --install-set %s\n",gettext("[disk set(s)] - install specified disk set(s)"));
printf(" --remove %s\n",gettext("[pkg name(s)] - remove specified pkg(s)"));
printf(" --show %s\n",gettext("[pkg name(s)] - show pkg(s) description"));
printf(" --filelist %s\n",gettext("[pkg name(s)] - show pkg(s) installed files"));
printf(" --search %s\n",gettext("[expression] - search available pkgs"));
- printf(" --list - %s\n",gettext("list pkgs"));
- printf(" --available - %s\n",gettext("list available pkgs"));
- printf(" --installed - %s\n",gettext("list installed pkgs"));
- printf(" --clean - %s\n",gettext("purge cached pkgs"));
- printf(" --autoclean - %s\n",gettext("only purge cache of older, unreacheable pkgs"));
+ printf(" --list %s\n",gettext("list pkgs"));
+ printf(" --available %s\n",gettext("list available pkgs"));
+ printf(" --installed %s\n",gettext("list installed pkgs"));
+ printf(" --clean %s\n",gettext("purge cached pkgs"));
+ printf(" --autoclean %s\n",gettext("only purge cache of older, unreacheable pkgs"));
#ifdef SLAPT_HAS_GPGME
- printf(" --add-keys - %s\n",gettext("retrieve GPG keys for sources"));
+ printf(" --add-keys %s\n",gettext("retrieve GPG keys for sources"));
#endif
- printf(" --help|-h - %s\n",gettext("display this help and exit"));
- printf(" --version - %s\n",gettext("print version and license info"));
+ printf(" -h, --help %s\n",gettext("display this help and exit"));
+ printf(" --version %s\n",gettext("print version and license info"));
printf("\n");
printf(gettext("Options:\n"));
- printf(" --download-only|-d - %s\n",gettext("only download pkg on install/upgrade"));
- printf(" --simulate|-s - %s\n",gettext("show pkgs to be installed/upgraded"));
- printf(" --no-prompt|-y - %s\n",gettext("do not prompt during install/upgrade"));
- printf(" --prompt|-p - %s\n",gettext("always prompt during install/upgrade"));
- printf(" --reinstall - %s\n",gettext("reinstall the pkg"));
- printf(" --ignore-excludes - %s\n",gettext("install/upgrade excludes"));
- printf(" --no-md5 - %s\n",gettext("do not perform md5 check sum"));
- printf(" --no-dep - %s\n",gettext("skip dependency check"));
- printf(" --ignore-dep - %s\n",gettext("ignore dependency failures"));
- printf(" --print-uris - %s\n",gettext("print URIs only, do not download"));
- printf(" --show-stats|-S - %s\n",gettext("show download statistics"));
- printf(" --config|-c [] - %s\n",gettext("specify alternate slapt-getrc location"));
- printf(" --remove-obsolete - %s\n",gettext("remove obsolete packages"));
- printf(" --retry [] - %s\n",gettext("specify number of download retry attempts"));
- printf(" --no-upgrade - %s\n",gettext("install package, do not attempt to upgrade"));
+ printf(" -d, --download-only %s\n",gettext("only download pkg on install/upgrade"));
+ printf(" -s, --simulate %s\n",gettext("show pkgs to be installed/upgraded"));
+ printf(" -y, --no-prompt %s\n",gettext("do not prompt during install/upgrade"));
+ printf(" -p, --prompt %s\n",gettext("always prompt during install/upgrade"));
+ printf(" --reinstall %s\n",gettext("reinstall the pkg"));
+ printf(" --ignore-excludes %s\n",gettext("install/upgrade excludes"));
+ printf(" --no-md5 %s\n",gettext("do not perform md5 check sum"));
+ printf(" --no-dep %s\n",gettext("skip dependency check"));
+ printf(" --ignore-dep %s\n",gettext("ignore dependency failures"));
+ printf(" --print-uris %s\n",gettext("print URIs only, do not download"));
+ printf(" -S, --show-stats %s\n",gettext("show download statistics"));
+ printf(" -c, --config [] %s\n",gettext("specify alternate slapt-getrc location"));
+ printf(" --remove-obsolete %s\n",gettext("remove obsolete packages"));
+ printf(" --retry [] %s\n",gettext("specify number of download retry attempts"));
+ printf(" --no-upgrade %s\n",gettext("install package, do not attempt to upgrade"));
}
void version_info(void)