Fix rig add on Linux and Windows

They have different version names.

Author: gaborcsardi

src/common.rs

@@ -109,10 +109,24 @@ pub fn sc_get_list_details() -> Result<Vec<InstalledVersion>, Box<dyn Error>> {
 
 // TODO: we should not hardcode this here...
 pub fn check_has_pak(ver: &String) -> Result<bool, Box<dyn Error>> {
-    let ver = Regex::new("-.*$")?.replace(ver, "").to_string();
-    let ver = ver + ".0";
+    // cur off -arm64 and -x86_64
+    let mut ver = Regex::new("-.*$")?.replace(ver, "").to_string();
+
+    // add .0 for macOS minor versions
+    let minor = Regex::new("^[0-9]+[.][0-9]+$")?;
+    if minor.is_match(&ver) {
+        ver = ver + ".0";
+    }
+
+    // cut off extra stuff on Windows
+    ver = Regex::new("[a-zA-Z][a-zA-Z0-9]*$")?.replace(&ver, "").to_string();
+
+    let vv = match Version::parse(&ver) {
+        Ok(x) => x,
+        Err(_) => return Ok(true)  // devel or next, probably
+    };
+
     let v350 = Version::parse("3.5.0")?;
-    let vv = Version::parse(&ver)?;
     if vv < v350 {
         bail!("Pak is only available for R 3.5.0 or later");
     }

tests/test-linux.sh

@@ -95,7 +95,7 @@ teardown() {
 
 @test "rm" {
     if ! rig ls | grep -q '^[* ] 3.3.3$'; then
-        run rig add 3.3
+        run rig add 3.3 --without-pak
         [[ "$status" -eq 0 ]]
         run rig ls
         echo "$output" | grep -q "^[* ] 3[.]3[.]3"