lib/gym/package_command_generator.rb in gym-0.3.2 vs lib/gym/package_command_generator.rb in gym-0.3.3

@@ -4,16 +4,13 @@
   # Because of a known bug in PackageApplication Perl script used by Xcode the packaging process is performed with
   # a patched version of the script.
   class PackageCommandGenerator
     class << self
       def generate
-        @patched_package_application = XcodeFix.patch_package_application
-
-        parts = ["/usr/bin/xcrun #{@patched_package_application} -v"]
+        parts = ["/usr/bin/xcrun #{XcodebuildFixes.patch_package_application} -v"]
         parts += options
         parts += pipe
-        parts += postfix
 
         parts
       end
 
       def options
@@ -36,26 +33,21 @@
 
       def pipe
         [""]
       end
 
-      def postfix
-        # Remove the patched PackageApplication file after the export is finished
-        ["&& rm '#{@patched_package_application}'"]
-      end
-
       def appfile_path
-        Dir.glob("#{BuildCommandGenerator.archive_path}/Products/Applications/*.app").first
+        Dir[BuildCommandGenerator.archive_path + "/**/*.app"].last
       end
 
       # We export it to the temporary folder and move it over to the actual output once it's finished and valid
       def ipa_path
         File.join(BuildCommandGenerator.build_path, "#{Gym.config[:output_name]}.ipa")
       end
 
       # The path the the dsym file for this app. Might be nil
       def dsym_path
-        Dir[BuildCommandGenerator.archive_path + "/**/*.dSYM"].last
+        Dir[BuildCommandGenerator.archive_path + "/**/*.app.dSYM"].last
       end
     end
   end
 end