浏览代码

fix(cli): only require development team when running iOS commands (#5071)

Lucas Fernandes Nogueira 3 年之前
父节点
当前提交
dee19784f9
共有 4 个文件被更改,包括 14 次插入7 次删除
  1. 1 1
      tooling/cli/src/mobile/android.rs
  2. 1 1
      tooling/cli/src/mobile/init.rs
  3. 1 1
      tooling/cli/src/mobile/ios.rs
  4. 11 4
      tooling/cli/src/mobile/mod.rs

+ 1 - 1
tooling/cli/src/mobile/android.rs

@@ -108,7 +108,7 @@ fn with_config<T>(
     let tauri_config_ = tauri_config_guard.as_ref().unwrap();
     let cli_options =
       cli_options.unwrap_or_else(|| read_options(tauri_config_, MobileTarget::Android));
-    let (config, metadata) = get_config(tauri_config_, &cli_options);
+    let (config, metadata) = get_config(tauri_config_, &cli_options, MobileTarget::Android);
     (config, metadata, cli_options)
   };
   f(&config, config.android(), metadata.android(), cli_options)

+ 1 - 1
tooling/cli/src/mobile/init.rs

@@ -107,7 +107,7 @@ pub fn exec(
   let tauri_config_guard = tauri_config.lock().unwrap();
   let tauri_config_ = tauri_config_guard.as_ref().unwrap();
 
-  let (config, metadata) = get_config(tauri_config_, &Default::default());
+  let (config, metadata) = get_config(tauri_config_, &Default::default(), target);
 
   let asset_dir = config.app().asset_dir();
   if !asset_dir.is_dir() {

+ 1 - 1
tooling/cli/src/mobile/ios.rs

@@ -115,7 +115,7 @@ fn with_config<T>(
     let tauri_config_guard = tauri_config.lock().unwrap();
     let tauri_config_ = tauri_config_guard.as_ref().unwrap();
     let cli_options = cli_options.unwrap_or_else(|| read_options(tauri_config_, MobileTarget::Ios));
-    let (config, metadata) = get_config(tauri_config_, &cli_options);
+    let (config, metadata) = get_config(tauri_config_, &cli_options, MobileTarget::Ios);
     (config, metadata, cli_options)
   };
   f(&config, config.apple(), metadata.apple(), cli_options)

+ 11 - 4
tooling/cli/src/mobile/mod.rs

@@ -199,7 +199,11 @@ fn read_options(config: &TauriConfig, target: Target) -> CliOptions {
   options
 }
 
-fn get_config(config: &TauriConfig, cli_options: &CliOptions) -> (Config, Metadata) {
+fn get_config(
+  config: &TauriConfig,
+  cli_options: &CliOptions,
+  #[allow(unused_variables)] target: Target,
+) -> (Config, Metadata) {
   let mut s = config.tauri.bundle.identifier.rsplit('.');
   let app_name = s.next().unwrap_or("app").to_string();
   let mut domain = String::new();
@@ -248,11 +252,14 @@ fn get_config(config: &TauriConfig, cli_options: &CliOptions) -> (Config, Metada
     },
     #[cfg(target_os = "macos")]
     apple: Some(RawAppleConfig {
-      development_team: std::env::var("TAURI_APPLE_DEVELOPMENT_TEAM")
+      development_team: if target == Target::Ios {
+        std::env::var("TAURI_APPLE_DEVELOPMENT_TEAM")
         .ok()
         .or_else(|| config.tauri.ios.development_team.clone())
-        .expect("you must set `tauri > iOS > developmentTeam` config value or the `TAURI_APPLE_DEVELOPMENT_TEAM` environment variable"),
-
+        .expect("you must set `tauri > iOS > developmentTeam` config value or the `TAURI_APPLE_DEVELOPMENT_TEAM` environment variable")
+      } else {
+        Default::default()
+      },
       ios_features: ios_options.features.clone(),
       bundle_version: config.package.version.clone(),
       bundle_version_short: config.package.version.clone(),