bin/nixenvironment in nixenvironment-0.0.81 vs bin/nixenvironment in nixenvironment-0.0.82

- old
+ new

@@ -171,43 +171,44 @@ command :deploy do |c| c.syntax = 'nixenvironment deploy' c.description = 'Deploy built artifacts to given server' c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity deploy (ios | macos | android | winphone)' + c.option '--deployment_names NAMES', String, 'Set names for mds buttons for each ipa type' c.option '--deliver_deploy', 'Not only verify but also submit the build on iTunes Connect. (resigned_appstore builds only)' c.action do |_args, options| - return if ENV['SKIP_DEPLOY'].present? + unless ENV['SKIP_DEPLOY'].present? + unity_platform = options.unity_platform + need_to_deploy_ios = false + need_to_deploy_macos_build = false + need_to_deploy_winphone_build = false - unity_platform = options.unity_platform - need_to_deploy_ios = false - need_to_deploy_macos_build = false - need_to_deploy_winphone_build = false + if unity_platform.present? + case unity_platform + when 'ios' + Dir.chdir(UNITY_IOS_PROJECT_PATH) + need_to_deploy_ios = true + when 'macos' + #Dir.chdir(UNITY_MACOS_PROJECT_PATH) + need_to_deploy_macos_build = true + when 'android' + system(DEPLOY_APK_SCRIPT_PATH) ? success('Unity android deploy complete!') : error('Unity android deploy error!') + when 'winphone' + #Dir.chdir(UNITY_WINPHONE_PROJECT_PATH) + need_to_deploy_winphone_build = true + else + error("Error: Unknown unity target platform '#{unity_platform}'!") + end + else + need_to_deploy_ios = true + end - if unity_platform.present? - case unity_platform - when 'ios' - Dir.chdir(UNITY_IOS_PROJECT_PATH) - need_to_deploy_ios = true - when 'macos' - #Dir.chdir(UNITY_MACOS_PROJECT_PATH) - need_to_deploy_macos_build = true - when 'android' - system(DEPLOY_APK_SCRIPT_PATH) ? success('Unity android deploy complete!') : error('Unity android deploy error!') - when 'winphone' - #Dir.chdir(UNITY_WINPHONE_PROJECT_PATH) - need_to_deploy_winphone_build = true - else - error("Error: Unknown unity target platform '#{unity_platform}'!") + if need_to_deploy_ios || need_to_deploy_macos_build + read_config_settings + deploy(options.deliver_deploy, options.deployment_names) end - else - need_to_deploy_ios = true end - - if need_to_deploy_ios || need_to_deploy_macos_build - read_config_settings - deploy(options.deliver_deploy) - end end end command :clean do |c| c.syntax = 'nixenvironment clean' @@ -687,20 +688,20 @@ File.delete(product_settings_path) File.rename(info_plist_backup_name, product_settings_path) puts "#{description}Info.plist was restored." end -def deploy(deliver_deploy) +def deploy(deliver_deploy, deployment_names) deploy_host = @config_settings[DEPLOY_HOST_KEY].blank? ? ENV[DEPLOY_HOST_KEY] : @config_settings[DEPLOY_HOST_KEY] deploy_username = @config_settings[DEPLOY_USERNAME_KEY].blank? ? ENV[DEPLOY_USERNAME_KEY] : @config_settings[DEPLOY_USERNAME_KEY] deploy_password = @config_settings[DEPLOY_PASSWORD_KEY].blank? ? ENV[DEPLOY_PASSWORD_KEY] : @config_settings[DEPLOY_PASSWORD_KEY] deploy_itunesconnect_username = @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY].blank? ? ENV[DEPLOY_ITUNESCONNECT_USERNAME_KEY] : @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY] sdk_name = BuildEnvVarsLoader.load_last_build_vars[SDK_NAME_KEY] deploy_path = sdk_name.include?('macos') ? MACOS_PROJECTS_DEPLOY_PATH : ENV[DEPLOY_PATH_KEY] deploy_path = @config_settings[DEPLOY_PATH_KEY] if @config_settings[DEPLOY_PATH_KEY].present? - Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deliver_deploy) + Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deliver_deploy, deployment_names) success('Deploy complete!') end def clean \ No newline at end of file