lib/reaver/walk.rb in reaver-0.10.1 vs lib/reaver/walk.rb in reaver-0.11.0

@@ -15,15 +15,15 @@
       x
     end
 
     def x
       case @extension
-      when %r{^image/jpeg} || %r{^image/png}
+      when %r{^image/(jpeg|png)}
         copy_file
       when %r{^application/zip}
         extract_zip
-      when %r{^application/gzip}
+      when %r{^application/(gzip|x-xz)}
         extract_gzip
       when %r{^font/ttf}
         copy_file
       else
         puts "Filetype #{@extension} not yet supported, skipping..."
@@ -58,11 +58,12 @@
       FileUtils.mkdir_p @final_dest
       `unzip -o -j #{@filename} -d #{@final_dest}`
     end
 
     def extract_gzip
-      puts "Extracting gzip archive #{@filename} at #{@final_dest}..."
+      ext = @extension.split('/').last
+      puts "Extracting #{ext} archive #{@filename} at #{@final_dest}..."
       FileUtils.mkdir_p @final_dest
-      `tar -x --strip-components=1 -f #{@filename} --one-top-level=#{@final_dest}`
+      `tar x -f #{@filename} --one-top-level=#{@final_dest}`
     end
   end
 end