clearlinux/swupd-client
2
0
Fork 0
mirror of https://github.com/clearlinux/swupd-client.git synced 2026-10-03 15:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add bundle-list environment options

Browse Source 
This adds are required standard options
to select content server, version server,
format, and so on.

Options added:
-u, url for version string and content file downloads
-c, url for content file downloads
-v, url for version string download
-p, path to verify
-F, format suffix for version file downloads
-n, Do not attempt to enforce certificate or signature checking
-S, Specify alternate swupd state directory
-C, Specify alternate path to swupd certificates

Signed-off-by: Mario Alfredo Carrillo Arevalo <mario.alfredo.c.arevalo@intel.com>
This commit is contained in:
Mario Alfredo Carrillo Arevalo
2017-02-01 11:03:43 -08:00
committed by tmarcu
parent bce9fb436f
commit d9cae3724f
1 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clr_bundle_ls.c
+70 -1
View File
@@ -34,12 +34,30 @@ static void print_help(const char *name)
printf("Help Options:\n");
printf(" -h, --help Show help options\n");
printf(" -a, --all List all available bundles for the current version of Clear Linux\n");
printf(" -u, --url=[URL] RFC-3986 encoded url for version string and content file downloads\n");
printf(" -c, --contenturl=[URL] RFC-3986 encoded url for content file downloads\n");
printf(" -v, --versionurl=[URL] RFC-3986 encoded url for version string download\n");
printf(" -p, --path=[PATH...] Use [PATH...] as the path to verify (eg: a chroot or btrfs subvol\n");
printf(" -F, --format=[staging,1,2,etc.] the format suffix for version file downloads\n");
printf(" -n, --nosigcheck Do not attempt to enforce certificate or signature checking\n");
printf(" -S, --statedir Specify alternate swupd state directory\n");
printf(" -C, --certpath Specify alternate path to swupd certificates\n");
printf("\n");
}
static const struct option prog_opts[] = {
{ "help", no_argument, 0, 'h'},
{ "all", no_argument, 0, 'a' },
{ "url", required_argument, 0, 'u' },
{ "contenturl", required_argument, 0, 'c' },
{ "versionurl", required_argument, 0, 'v' },
{ "path", required_argument, 0, 'p' },
{ "format", required_argument, 0, 'F' },
{ "nosigcheck", no_argument, 0, 'n' },
{ "statedir", required_argument, 0, 'S' },
{ "certpath", required_argument, 0, 'C' },
{ 0, 0, 0, 0 }
};
@@ -47,7 +65,7 @@ static bool parse_options(int argc, char **argv)
{
int opt;
while ((opt = getopt_long(argc, argv, "ha", prog_opts, NULL)) != -1) {
while ((opt = getopt_long(argc, argv, "hanu:c:v:p:F:S:C:", prog_opts, NULL)) != -1) {
switch (opt) {
case '?':
case 'h':
@@ -56,6 +74,57 @@ static bool parse_options(int argc, char **argv)
case 'a':
return list_installable_bundles();
break;
case 'u':
if (!optarg) {
printf("error: invalid --url argument\n\n");
goto err;
}
set_version_url(optarg);
set_content_url(optarg);
break;
case 'c':
if (!optarg) {
printf("Invalid --contenturl argument\n\n");
goto err;
}
set_content_url(optarg);
break;
case 'v':
if (!optarg) {
printf("Invalid --versionurl argument\n\n");
goto err;
}
set_version_url(optarg);
break;
case 'p': /* default empty path_prefix verifies the running OS */
if (!optarg || !set_path_prefix(optarg)) {
printf("Invalid --path argument\n\n");
goto err;
}
break;
case 'F':
if (!optarg || !set_format_string(optarg)) {
printf("Invalid --format argument\n\n");
goto err;
}
break;
case 'n':
sigcheck = false;
break;
case 'S':
if (!optarg || !set_state_dir(optarg)) {
printf("Invalid --statedir argument\n\n");
goto err;
}
break;
case 'C':
if (!optarg) {
printf("Invalid --certpath argument\n\n");
goto err;
}
set_cert_path(optarg);
break;
default:
printf("error: unrecognized option\n\n");
goto err;