bootstrap: support local profiles

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

src/bootstrap/bootstrap.py

@@ -1280,15 +1280,18 @@ def bootstrap(args):
         profile = "dist"
 
     if profile is not None:
-        # Allows creating alias for profile names, allowing
-        # profiles to be renamed while maintaining back compatibility
-        # Keep in sync with `profile_aliases` in config.rs
-        profile_aliases = {"user": "dist"}
-        include_file = "bootstrap.{}.toml".format(
-            profile_aliases.get(profile) or profile
-        )
-        include_dir = os.path.join(rust_root, "src", "bootstrap", "defaults")
-        include_path = os.path.join(include_dir, include_file)
+        include_path = os.path.join("{}.toml".format(profile))
+
+        if not os.path.exists(include_path):
+            # Allows creating alias for profile names, allowing
+            # profiles to be renamed while maintaining back compatibility
+            # Keep in sync with `profile_aliases` in config.rs
+            profile_aliases = {"user": "dist"}
+            include_file = "bootstrap.{}.toml".format(
+                profile_aliases.get(profile) or profile
+            )
+            include_dir = os.path.join(rust_root, "src", "bootstrap", "defaults")
+            include_path = os.path.join(include_dir, include_file)
 
         if not os.path.exists(include_path):
             raise Exception(

src/bootstrap/src/core/config/config.rs

@@ -1552,27 +1552,33 @@ impl Config {
             toml.profile = Some("dist".into());
         }
 
-        if let Some(include) = &toml.profile {
-            // Allows creating alias for profile names, allowing
-            // profiles to be renamed while maintaining back compatibility
-            // Keep in sync with `profile_aliases` in bootstrap.py
-            let profile_aliases = HashMap::from([("user", "dist")]);
-            let include = match profile_aliases.get(include.as_str()) {
-                Some(alias) => alias,
-                None => include.as_str(),
-            };
-            let mut include_path = config.src.clone();
-            include_path.push("src");
-            include_path.push("bootstrap");
-            include_path.push("defaults");
-            include_path.push(format!("bootstrap.{include}.toml"));
+        if let Some(profile) = &toml.profile {
+            let mut include_path = PathBuf::from(format!("{profile}.toml"));
+
+            if !include_path.exists() {
+                // Allows creating alias for profile names, allowing
+                // profiles to be renamed while maintaining back compatibility
+                // Keep in sync with `profile_aliases` in bootstrap.py
+                let profile_aliases = HashMap::from([("user", "dist")]);
+                let profile = match profile_aliases.get(profile.as_str()) {
+                    Some(alias) => alias,
+                    None => profile.as_str(),
+                };
+
+                include_path = config
+                    .src
+                    .join("src/bootstrap/defaults")
+                    .join(format!("bootstrap.{profile}.toml"));
+            }
+
             let included_toml = get_toml(&include_path).unwrap_or_else(|e| {
                 eprintln!(
                     "ERROR: Failed to parse default config profile at '{}': {e}",
                     include_path.display()
                 );
                 exit!(2);
             });
+
             toml.merge(included_toml, ReplaceOpt::IgnoreDuplicate);
         }