Default to local arch in rig resolve & available

- `rig resolve` defaults to aarch64 on aarc64 Windows.
- `rig available` defaults to aarch64 on aarch64 Windows.
- `rig availabl --list-rtools-versions` works on aarch64
  Windows, and defaults to aarch64.
- Make `arm64` an alias to `aarch64` on Windows.

Closes #298.

Author: gaborcsardi

src/args.rs

@@ -215,7 +215,7 @@ pub fn rig_app() -> Command {
                 .long("arch")
                 .required(false)
                 .default_value(&_default_arch)
-                .value_parser(["aarch64", "x86_64"]),
+                .value_parser(["x86_64", "aarch64", "arm64"]),
         );
     }
 
@@ -278,7 +278,7 @@ pub fn rig_app() -> Command {
             .conflicts_with("list-distros")
         );
 
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(any(target_os = "linux"))]
     {
         cmd_available = cmd_available.arg(
             Arg::new("arch")
@@ -303,6 +303,19 @@ pub fn rig_app() -> Command {
         );
     }
 
+    #[cfg(target_os = "windows")]
+    {
+        cmd_available = cmd_available.arg(
+            Arg::new("arch")
+                .help(HELP_ARCH)
+                .short('a')
+                .long("arch")
+                .required(false)
+                .default_value(&_default_arch)
+                .value_parser(["x86_64", "aarch64", "arm64"]),
+        );
+    }
+
     let mut cmd_system = Command::new("system")
         .about("Manage current installations")
         .long_about(HELP_SYSTEM)
@@ -536,7 +549,7 @@ pub fn rig_app() -> Command {
                 .required(false)
         );
 
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(any(target_os = "linux"))]
     {
         cmd_resolve = cmd_resolve.arg(
             Arg::new("arch")
@@ -548,7 +561,7 @@ pub fn rig_app() -> Command {
         );
     }
 
-    #[cfg(target_os = "macos")]
+    #[cfg(any(target_os = "macos"))]
     {
         cmd_resolve = cmd_resolve.arg(
             Arg::new("arch")
@@ -561,6 +574,19 @@ pub fn rig_app() -> Command {
         );
     }
 
+    #[cfg(any(target_os = "windows"))]
+    {
+        cmd_resolve = cmd_resolve.arg(
+            Arg::new("arch")
+                .help(HELP_ARCH)
+                .short('a')
+                .long("arch")
+                .required(false)
+                .default_value(&_default_arch)
+                .value_parser(["x86_64", "aarch64", "arm64"]),
+        );
+    }
+
     let mut cmd_rstudio = Command::new("rstudio")
         .about("Start RStudio with specified R version")
         .long_about(HELP_RSTUDIO);

src/common.rs

@@ -611,7 +611,11 @@ fn sc_available_distros(args: &ArgMatches, mainargs: &ArgMatches)
 fn sc_available_rtools_versions(args: &ArgMatches, mainargs: &ArgMatches)
                                 -> Result<(), Box<dyn Error>> {
 
-    let url = "https://api.r-hub.io/rversions/rtools-versions".to_string();
+    let mut url = "https://api.r-hub.io/rversions/rtools-versions".to_string();
+    let arch = get_arch("windows", args);
+    if arch != "x86_64" {
+	url = url + "/" + &arch;
+    }
     let resp = download_json_sync(vec![url])?;
     let resp = resp[0].as_array().unwrap();
     let all = args.get_flag("all");