Merge pull request #121 from AleksArt000/main

fixed variable parsing

src/config.c

@@ -80,7 +80,7 @@ int readConfig(const char* configFilePath, int overwrite)
         line[strlen(line) - 1] = 0;
         parse_env(&line);
 
-        if((line[0] != '#' || (line[0] != '/' && line[1] != '/')) && strstr(line, "=") != 0)
+        if(((line[0] != '#') && ((line[0] != '/') && (line[1] != '/'))) && (strstr(line, "=") != 0))
         {
             char* key = strtok(line, "=");
             char* value = strchr(line, '\0') + 1;

src/install.c

@@ -75,9 +75,38 @@ int f_install_package_source(const char* spm_path, int as_dep, char* repo) {
     QUEUE_COUNT++;
     dbg(1, "Added %s to the queue", pkg.name);
 
+    // Set the package info section as environment vadiables for make script
+    setenv("NAME", pkg.name, 1);
+    setenv("VERSION", pkg.version, 1);
 
-    // Get global environment variables
+    if (pkg.url != NULL)
+    {       
+        parse_env(&(pkg.url));
+        dbg(1, "URL: %s", pkg.url);
+        setenv("URL", pkg.url, 1);
+    }
+
+    if (pkg.type != NULL)
+    {
+        setenv("TYPE", pkg.type, 1);
+    }
 
+    if (pkg.license != NULL)
+    {
+        setenv("LICENSE", pkg.license, 1);
+    }
+
+    if (pkg.sha256 != NULL)
+    {
+        setenv("SHA256", pkg.sha256, 1);
+    }
+
+    // Set environment variables for building
+    setenv("BUILD_ROOT", build_dir, 1);
+
+    /* Warning: there is something sussy going on beyond this point */
+
+    // Get global environment variables
     if (pkg.environment != NULL) 
     {
         dbg(1, "Getting environment variables...");
@@ -88,7 +117,6 @@ int f_install_package_source(const char* spm_path, int as_dep, char* repo) {
     }
 
     // Set global environment variables
-
     if (pkg.exports != NULL && pkg.exportsCount > 0 && strlen(pkg.exports[0]) > 0) 
     {
         dbg(1, "Setting environment variables...");
@@ -101,11 +129,13 @@ int f_install_package_source(const char* spm_path, int as_dep, char* repo) {
         for (int i = 0; i < pkg.exportsCount; i++)
         {
             fprintf(env_file, "%s\n", pkg.exports[i]);
+            char* line = strdup(pkg.exports[i]);
+            parse_env(&line);
 
-            if((pkg.exports[i][0] != '#' || (pkg.exports[i][0] != '/' && pkg.exports[i][1] != '/')) && strstr(pkg.exports[i], "=") != 0)
+            if(((line[0] != '#') && ((line[0] != '/') && (line[1] != '/'))) && (strstr(line, "=") != 0))
             {
-                char* key = strtok(pkg.exports[i], "=");
-                char* value = strchr(pkg.exports[i], '\0') + 1;
+                char* key = strtok(line, "=");
+                char* value = strchr(line, '\0') + 1;
 
                 if (key == NULL || value == NULL) 
                 {
@@ -117,41 +147,12 @@ int f_install_package_source(const char* spm_path, int as_dep, char* repo) {
                 // Set environment variables based on the key-value pairs in the config file
                 setenv(key, value, 1);
             }
+            free(line);
         }
 
         fclose(env_file);
     }
 
-    // Set the package info section as environment vadiables for make script
-
-    setenv("NAME", pkg.name, 1);
-    setenv("VERSION", pkg.version, 1);
-
-    if (pkg.url != NULL)
-    {       
-        parse_env(&(pkg.url));
-        dbg(1, "URL: %s", pkg.url);
-        setenv("URL", pkg.url, 1);
-    }
-
-    if (pkg.type != NULL)
-    {
-        setenv("TYPE", pkg.type, 1);
-    }
-
-    if (pkg.license != NULL)
-    {
-        setenv("LICENSE", pkg.license, 1);
-    }
-
-    if (pkg.sha256 != NULL)
-    {
-        setenv("SHA256", pkg.sha256, 1);
-    }
-
-    // Set environment variables for building
-    setenv("BUILD_ROOT", build_dir, 1);
-
 
     // Check if a package is a collection
     if(strcmp(pkg.type, "con") != 0)

test/test.c

@@ -205,6 +205,8 @@ void test_split() {
     free(*split_list);
     free(split_list);
 
+    dbg(2, "str_split: %s", str_split);
+    dbg(2, "split_str: %s", split_str);
 
     assert(strcmp(str_split,split_str) == 0);