aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-03-11 09:57:21 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-03-11 09:57:21 -0400
commit42f1813ea2ea44ac7aa7e30eeedde4ed7d3581c1 (patch)
tree1b86b7e9a171f439e7599d3ed2d31b7d35731cd9
parent9fd892a13077a6fae3ff403f95719530664b26a8 (diff)
downloadstasis-42f1813ea2ea44ac7aa7e30eeedde4ed7d3581c1.tar.gz
Set globals struct values as intended
* Bare variables predated the globals struct. This better aligns with how options are consumed throughout the program
-rw-r--r--src/main.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index 064a28f..a2aebbe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -156,8 +156,6 @@ int main(int argc, char *argv[], char *arge[]) {
char *config_input = NULL;
char installer_url[PATH_MAX];
char python_override_version[OMC_NAME_MAX];
- unsigned char arg_continue_on_error = 0;
- unsigned char arg_always_update_base_environment = 0;
int c;
int option_index = 0;
@@ -173,13 +171,13 @@ int main(int argc, char *argv[], char *arge[]) {
config_input = strdup(optarg);
break;
case 'C':
- arg_continue_on_error = true;
+ globals.continue_on_error = true;
break;
case 'p':
strcpy(python_override_version, optarg);
break;
case OPT_ALWAYS_UPDATE_BASE:
- arg_always_update_base_environment = true;
+ globals.always_update_base_environment = true;
break;
case 'U':
setenv("PYTHONUNBUFFERED", "1", 1);
@@ -304,9 +302,6 @@ int main(int argc, char *argv[], char *arge[]) {
exit(1);
}
- globals.always_update_base_environment = arg_always_update_base_environment;
- globals.continue_on_error = arg_continue_on_error;
-
msg(OMC_MSG_L2, "Configuring JFrog CLI\n");
if (delivery_init_artifactory(&ctx)) {
msg(OMC_MSG_ERROR | OMC_MSG_L2, "JFrog CLI configuration failed\n");