bin/nixenvironment in nixenvironment-0.0.137 vs bin/nixenvironment in nixenvironment-0.0.138

@@ -71,11 +71,11 @@
   c.option '--keystore_password PASSWORD', String, 'Specify the password for accessing a .keystore file'
   c.option '--key_alias_name NAME', String, 'Specify the alias name which should be used from .keystore file to sign a release version of an APK'
   c.option '--key_alias_password PASSWORD', String, 'Specify the password for accessing an alias name'
   c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios | macos | android | winphone | webgl)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
-  c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
+  c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (on, off)'
   c.option '--app_version VERSION', String, 'Specify the version of the app (not implemented for unity-android)' # TODO: implement for unity-android
   c.option '--build_number BUILD_NUMBER', String, 'Specify the build number of the app (not implemented for unity-android)' # TODO: implement for unity-android
   c.option '--requires_fullscreen', 'Set UIRequiresFullScreen to YES in Info.plist (ios)'
   c.option '--skip_working_copy_check', 'Skip working copy cleaning check'
   c.option '--share_schemes', 'Share schemes for xcode project'
@@ -84,22 +84,21 @@
     $workspace = options.workspace
     $project = options.project
     $scheme = options.scheme
     $sdk = options.sdk
 
-    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
+    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'on', :unity_path => 'UNITY'
     unity_platform    = options.unity_platform
     is_unity_platform = unity_platform.present?
     need_to_build_ios              = true
     need_to_process_macos_build    = false
     need_to_process_winphone_build = false
     need_to_process_webgl_build    = false
 
     $build_number = options.build_number
 
     if is_unity_platform
-      ENV['UNITY_BUILD'] = 'UNITY_BUILD'
       unity_path = ENV[options.unity_path] || options.unity_path
       unity_build(options.config, unity_platform, unity_path, options.development_build, options.connect_profiler,
                   options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
       need_to_build_ios              = unity_platform == 'ios'
       need_to_process_macos_build    = unity_platform == 'macos'
@@ -569,10 +568,23 @@
     xc_args = other_args_str
   end
 
   FileUtils.rm_rf IOS_BUILD_DIRECTORY_NAME
 
+  if sdk.include?('iphoneos')
+
+    if config == 'Release'
+      puts 'IconTagger: configuration is Release. Skipping ...'
+    else
+      case icon_tagger
+      when 'on'    then tag_icon
+      when 'off'   then puts 'IconTagger is disabled. Skipping ...'
+      else              puts "Unknown IconTagger mode: '#{icon_tagger}'. Skipping ..."
+      end
+    end
+  end
+
   Xcodebuild.build(sdk, config, xcconfig, project, workspace, scheme, env_var_prefix, xc_args)
 
   error('Build error!') unless Xcodebuild.last_cmd_success?
 
   if sdk.include?('macos')
@@ -584,23 +596,10 @@
 
     success("Make 'macos_zip' complete!")
   elsif sdk.include?('iphoneos')
     puts
 
-    if config == 'Release'
-      puts 'IconTagger: configuration is Release. Skipping ...'
-    else
-      case icon_tagger
-      when 'full'  then tag_icon(false)
-      when 'short' then tag_icon(true)
-      when 'off'   then puts 'IconTagger is disabled. Skipping ...'
-      else              puts "Unknown IconTagger mode: '#{icon_tagger}'. Skipping ..."
-      end
-    end
-
-    puts
-
     ipa.split.each do |current_ipa|
       begin
         case current_ipa
         when 'device'            then Archiver.make_signed_ipa
         when 'resigned_device'   then Archiver.make_resigned_ipa_for_device
@@ -672,26 +671,19 @@
   clean_working_copy(false)
 
   success("Unity build complete!\n")
 end
 
-def tag_icon(short_version)
+def tag_icon
   plist_path         = @config_settings[PRODUCT_SETTINGS_PATH_KEY]
   info_plist         = Plist.from_file(plist_path)
   version            = info_plist['CFBundleShortVersionString']
-  style              = short_version ? 'OneLine' : 'TwoLine'
-  mask_path          = File.join(TAGGER_UTILITY_DIRECTORY, "masks/#{style}Mask.png")
   icons_dir          = File.join(Dir.pwd, @config_settings[ICONS_PATH_KEY])
-  app_product        = File.join(@config_settings[BUILT_PRODUCTS_DIR_KEY], @config_settings[EXECUTABLE_NAME_KEY]) + APP_EXT
 
-  system("#{TAGGER_UTILITY_PATH} --shortVersion='#{version}'\
-                                 --buildNumber='#{build_number}'\
-                                 --style='#{style}'\
-                                 --maskPath='#{mask_path}'\
-                                 --plist='#{plist_path}'\
-                                 --sourceIconsPath='#{icons_dir}'\
-                                 --destinationIconsPath='#{app_product}'")
+  workspaces_in_dir  = Dir.pwd
+
+  system("#{TAGGER_UTILITY_PATH} '#{version}' '#{build_number}' '#{workspaces_in_dir}' '#{icons_dir}'")
 end
 
 def backup_info_plists
   puts
   @info_plist_backup_name                    = backup_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    nil)
@@ -831,6 +823,6 @@
 end
 
 def success(msg)
   puts
   puts msg.green.bold
-end
\ No newline at end of file
+end