fix: maven-mvnd does not install with aqua (#3993)

jdx · Jan 8, 2025 · de32f03 · de32f03
1 parent fd924f7
commit de32f03
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/aqua/aqua_registry.rs b/src/aqua/aqua_registry.rs
@@ -322,13 +322,7 @@ impl AquaPackage {
     }
 
     pub fn asset(&self, v: &str) -> Result<String> {
-        // derive asset from url if not set and url contains a path
-        if self.asset.is_empty() && self.url.split("/").count() > "//".len() {
-            let asset = self.url.rsplit("/").next().unwrap_or("");
-            self.parse_aqua_str(asset, v, &Default::default())
-        } else {
-            self.parse_aqua_str(&self.asset, v, &Default::default())
-        }
+        self.parse_aqua_str(&self.asset, v, &Default::default())
     }
 
     pub fn asset_strs(&self, v: &str) -> Result<IndexSet<String>> {
@@ -450,6 +444,9 @@ impl AquaFile {
 }
 
 fn apply_override(mut orig: AquaPackage, avo: &AquaPackage) -> AquaPackage {
+    if orig.r#type != avo.r#type {
+        orig.r#type = avo.r#type.clone();
+    }
     if !avo.repo_owner.is_empty() {
         orig.repo_owner = avo.repo_owner.clone();
     }