installer: Separate install functions to improve clarity.

Author: nouwaarom

src/clib-build.c

@@ -85,7 +85,7 @@ struct options {
 
 const char *manifest_names[] = {"clib.json", "package.json", 0};
 
-clib_package_opts_t package_opts = {0};
+clib_package_opts_t build_package_opts = {0};
 clib_package_t *root_package = 0;
 
 command_t program = {0};
@@ -237,8 +237,8 @@ int build_package_with_manifest_name(const char *dir, const char *file) {
     }
 
     if (root_package && root_package->prefix) {
-      package_opts.prefix = root_package->prefix;
-      clib_package_set_opts(package_opts);
+      build_package_opts.prefix = root_package->prefix;
+      clib_package_set_opts(build_package_opts);
       setenv("PREFIX", package_opts.prefix, 1);
     } else if (opts.prefix) {
       setenv("PREFIX", opts.prefix, 1);
@@ -678,12 +678,12 @@ int main(int argc, char **argv) {
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);
 
-  package_opts.skip_cache = opts.skip_cache;
-  package_opts.prefix = opts.prefix;
-  package_opts.global = opts.global;
-  package_opts.force = opts.force;
+  build_package_opts.skip_cache = opts.skip_cache;
+  build_package_opts.prefix = opts.prefix;
+  build_package_opts.global = opts.global;
+  build_package_opts.force = opts.force;
 
-  clib_package_set_opts(package_opts);
+  clib_package_set_opts(build_package_opts);
 
   if (0 == program.argc || (argc == rest_offset + rest_argc)) {
     rc = build_package(CWD);

src/clib-configure.c

@@ -76,7 +76,7 @@ struct options {
 
 const char *manifest_names[] = {"clib.json", "package.json", 0};
 
-clib_package_opts_t package_opts = {0};
+clib_package_opts_t configure_package_opts = {0};
 clib_package_t *root_package = 0;
 
 hash_t *configured = 0;
@@ -609,12 +609,12 @@ int main(int argc, char **argv) {
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);
 
-  package_opts.skip_cache = opts.skip_cache;
-  package_opts.prefix = opts.prefix;
-  package_opts.global = opts.global;
-  package_opts.force = opts.force;
+  configure_package_opts.skip_cache = package_opts.skip_cache;
+  configure_package_opts.prefix = package_opts.prefix;
+  configure_package_opts.global = package_opts.global;
+  configure_package_opts.force = package_opts.force;
 
-  clib_package_set_opts(package_opts);
+  clib_package_set_opts(configure_package_opts);
 
   if (0 == program.argc || (argc == rest_offset + rest_argc)) {
     rc = configure_package(CWD);

src/clib-install.c

@@ -11,20 +11,18 @@
 #include "common/clib-validate.h"
 #include "debug/debug.h"
 #include "fs/fs.h"
-#include "http-get/http-get.h"
 #include "logger/logger.h"
 #include "parson/parson.h"
-#include "str-replace/str-replace.h"
 #include "version.h"
 #include <clib-secrets.h>
 #include <curl/curl.h>
-#include <libgen.h>
 #include <limits.h>
 #include <registry-manager.h>
 #include <repository.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "clib-package-installer.h"
 
 #define CLIB_PACKAGE_CACHE_TIME 30 * 24 * 60 * 60
 
@@ -65,8 +63,9 @@ static struct options opts = {0};
 
 static const char *manifest_names[] = {"clib.json", "package.json", NULL};
 
-static clib_package_opts_t package_opts = {0};
 static clib_package_t *root_package = NULL;
+static clib_secrets_t secrets = NULL;
+static registries_t registries = NULL;
 
 /**
  * Option setters.
@@ -286,27 +285,18 @@ static int install_package(const char *slug) {
     }
   }
 
-  // Read local config files.
-  clib_secrets_t secrets = clib_secrets_load_from_file("clib_secrets.json");
-  repository_init(secrets); // The repository requires the secrets for authentication.
-  clib_package_t *package = clib_package_load_local_manifest(0);
-
-  registries_t registries = registry_manager_init_registries(package->registries, secrets);
-  registry_manager_fetch_registries(registries);
   registry_package_ptr_t package_info = registry_manger_find_package(registries, slug);
   if (!package_info) {
     debug(&debugger, "Package %s not found in any registry.", slug);
     return -1;
   }
 
-
   pkg = clib_package_new_from_slug_and_url(slug, registry_package_get_href(package_info), opts.verbose);
   if (NULL == pkg)
     return -1;
 
   if (root_package && root_package->prefix) {
     package_opts.prefix = root_package->prefix;
-    clib_package_set_opts(package_opts);
   }
 
   rc = clib_package_install(pkg, opts.dir, opts.verbose);
@@ -425,38 +415,34 @@ int main(int argc, char *argv[]) {
     realpath(opts.prefix, prefix);
     unsigned long int size = strlen(prefix) + 1;
     opts.prefix = malloc(size);
-    memset((void *)opts.prefix, 0, size);
-    memcpy((void *)opts.prefix, prefix, size);
+    memset((void *) opts.prefix, 0, size);
+    memcpy((void *) opts.prefix, prefix, size);
   }
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);
 
-  package_opts.skip_cache = opts.skip_cache;
-  package_opts.prefix = opts.prefix;
-  package_opts.global = opts.global;
-  package_opts.force = opts.force;
-  package_opts.token = opts.token;
+  clib_package_opts_t install_package_opts;
+  install_package_opts.skip_cache = opts.skip_cache;
+  install_package_opts.prefix = opts.prefix;
+  install_package_opts.global = opts.global;
+  install_package_opts.force = opts.force;
+  install_package_opts.token = opts.token;
 
 #ifdef HAVE_PTHREADS
-  package_opts.concurrency = opts.concurrency;
+  install_package_opts.concurrency = opts.concurrency;
 #endif
 
-  clib_package_set_opts(package_opts);
+  clib_package_set_opts(install_package_opts);
 
-  if (!root_package) {
-    const char *name = NULL;
-    char *json = NULL;
-    unsigned int i = 0;
+  // Read local config files.
+  secrets = clib_secrets_load_from_file("clib_secrets.json");
+  root_package = clib_package_load_local_manifest(0);
 
-    do {
-      name = manifest_names[i];
-      json = fs_read(name);
-    } while (NULL != manifest_names[++i] && !json);
+  repository_init(secrets); // The repository requires the secrets for authentication.
+  registries = registry_manager_init_registries(root_package->registries, secrets);
+  registry_manager_fetch_registries(registries);
 
-    if (json) {
-      root_package = clib_package_new(json, opts.verbose);
-    }
-  }
+  clib_package_installer_init(registries, secrets);
 
   int code = 0 == program.argc ? install_local_packages()
                                : install_packages(program.argc, program.argv);

src/clib-update.c

@@ -16,6 +16,7 @@
 #include "parson/parson.h"
 #include "str-replace/str-replace.h"
 #include "version.h"
+#include <clib-package-installer.h>
 #include <curl/curl.h>
 #include <libgen.h>
 #include <limits.h>
@@ -57,7 +58,6 @@ static struct options opts = {0};
 
 static const char *manifest_names[] = {"clib.json", "package.json", NULL};
 
-static clib_package_opts_t package_opts = {0};
 static clib_package_t *root_package = NULL;
 
 /**
@@ -338,26 +338,26 @@ int main(int argc, char *argv[]) {
     logger_error("error", "Failed to initialize cURL");
   }
 
-  if (opts.prefix) {
+  if (package_opts.prefix) {
     char prefix[path_max];
     memset(prefix, 0, path_max);
-    realpath(opts.prefix, prefix);
+    realpath(package_opts.prefix, prefix);
     unsigned long int size = strlen(prefix) + 1;
-    opts.prefix = malloc(size);
-    memset((void *)opts.prefix, 0, size);
-    memcpy((void *)opts.prefix, prefix, size);
+    package_opts.prefix = malloc(size);
+    memset((void *) package_opts.prefix, 0, size);
+    memcpy((void *) package_opts.prefix, prefix, size);
   }
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);
 
   package_opts.skip_cache = 1;
-  package_opts.prefix = opts.prefix;
+  package_opts.prefix = package_opts.prefix;
   package_opts.global = 0;
   package_opts.force = 1;
-  package_opts.token = opts.token;
+  package_opts.token = package_opts.token;
 
 #ifdef HAVE_PTHREADS
-  package_opts.concurrency = opts.concurrency;
+  package_opts.concurrency = package_opts.concurrency;
 #endif
 
   clib_package_set_opts(package_opts);

src/clib-upgrade.c

@@ -18,6 +18,7 @@
 #include "tempdir/tempdir.h"
 #include "version.h"
 #include <asprintf/asprintf.h>
+#include <clib-package-installer.h>
 #include <curl/curl.h>
 #include <libgen.h>
 #include <limits.h>
@@ -61,7 +62,7 @@ static struct options opts = {0};
 
 static const char *manifest_names[] = {"clib.json", "package.json", NULL};
 
-static clib_package_opts_t package_opts = {0};
+static clib_package_opts_t upgrade_package_opts = {0};
 static clib_package_t *root_package = NULL;
 
 /**
@@ -155,8 +156,8 @@ static int install_package(const char *slug) {
   }
 
   if (root_package && root_package->prefix) {
-    package_opts.prefix = root_package->prefix;
-    clib_package_set_opts(package_opts);
+    upgrade_package_opts.prefix = root_package->prefix;
+    clib_package_set_opts(upgrade_package_opts);
   }
 
   char *tmp = gettempdir();
@@ -239,23 +240,23 @@ int main(int argc, char *argv[]) {
     realpath(opts.prefix, prefix);
     unsigned long int size = strlen(prefix) + 1;
     opts.prefix = malloc(size);
-    memset((void *)opts.prefix, 0, size);
-    memcpy((void *)opts.prefix, prefix, size);
+    memset((void *) opts.prefix, 0, size);
+    memcpy((void *) opts.prefix, prefix, size);
   }
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);
 
-  package_opts.skip_cache = 1;
-  package_opts.prefix = opts.prefix;
-  package_opts.global = 1;
-  package_opts.force = opts.force;
-  package_opts.token = opts.token;
+  upgrade_package_opts.skip_cache = 1;
+  upgrade_package_opts.prefix = opts.prefix;
+  upgrade_package_opts.global = 1;
+  upgrade_package_opts.force = opts.force;
+  upgrade_package_opts.token = opts.token;
 
 #ifdef HAVE_PTHREADS
-  package_opts.concurrency = opts.concurrency;
+  upgrade_package_opts.concurrency = opts.concurrency;
 #endif
 
-  clib_package_set_opts(package_opts);
+  clib_package_set_opts(upgrade_package_opts);
 
   char *slug = 0;