Use configured libc, allow force reinstall

Author: octylFractal

src/command/update.rs

@@ -18,6 +18,9 @@ pub struct UpdateInstalled {
     check: bool,
     /// The JDK to update. Version key, 'all', or 'default'.
     target: UpdateTarget,
+    /// Force update even if the version is the same.
+    #[clap(short, long)]
+    force: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -95,19 +98,24 @@ impl JpreCommand for UpdateInstalled {
                     }
                 };
                 let latest = list_info.java_version;
-                if latest.compare(&full_version) == std::cmp::Ordering::Greater {
+                let do_update = if latest.compare(&full_version) == std::cmp::Ordering::Greater {
                     eprintln!(
                         "  New version available: {}",
                         latest.if_supports_color(Stream::Stderr, |s| s.color(jdk_color()))
                     );
-                    if !self.check {
-                        Self::update_jdk(&context, &jdk)?;
-                    }
+                    true
                 } else {
                     eprintln!(
                         "  Already up-to-date: {}",
                         full_version.if_supports_color(Stream::Stderr, |s| s.color(jdk_color()))
                     );
+                    if self.force {
+                        eprintln!("  Forcing re-install...");
+                    }
+                    self.force
+                };
+                if do_update && !self.check {
+                    Self::update_jdk(&context, &jdk)?;
                 }
             } else {
                 warn!("No full version found for {}", jdk);

src/config.rs

@@ -35,6 +35,18 @@ pub struct JpreConfig {
     /// mapped.
     #[serde(default)]
     pub forced_os: Option<String>,
+    /// libc to force when downloading a JDK. If not set, "glibc" will be used.
+    /// This is only relevant on Linux.
+    #[serde(default = "default_libc")]
+    pub forced_libc: String,
+}
+
+fn default_distribution() -> Vec<String> {
+    vec!["temurin".to_string()]
+}
+
+fn default_libc() -> String {
+    "glibc".to_string()
 }
 
 impl JpreConfig {
@@ -149,7 +161,3 @@ impl JpreConfig {
         Ok(())
     }
 }
-
-fn default_distribution() -> Vec<String> {
-    vec!["temurin".to_string()]
-}

src/foojay.rs

@@ -39,11 +39,11 @@ fn detected_foojay_arch() -> &'static str {
     }
 }
 
-fn detected_foojay_os() -> &'static str {
+fn detected_foojay_os(libc: &str) -> &'static str {
     match std::env::consts::OS {
         "macos" => "macos",
         "linux" => {
-            if cfg!(target_env = "musl") {
+            if libc == "musl" {
                 "linux-musl"
             } else {
                 "linux"
@@ -139,10 +139,11 @@ impl FoojayDiscoApi {
             .forced_architecture
             .clone()
             .unwrap_or_else(|| detected_foojay_arch().to_string());
+        let libc = config.forced_libc.clone();
         let os = config
             .forced_os
             .clone()
-            .unwrap_or_else(|| detected_foojay_os().to_string());
+            .unwrap_or_else(|| detected_foojay_os(&libc).to_string());
         let url = Url::parse_with_params(
             &format!("{}/packages", FOOJAY_BASE_URL),
             &[
@@ -164,6 +165,7 @@ impl FoojayDiscoApi {
                 ("distribution", distribution.to_string()),
                 ("operating_system", os),
                 ("architecture", arch),
+                ("libc_type", libc.clone()),
             ],
         )
         .unwrap();