diff --git a/lib/rex/zip/samples/comment.rb b/lib/rex/zip/samples/comment.rb index f0e4a30b8b..a879554b00 100755 --- a/lib/rex/zip/samples/comment.rb +++ b/lib/rex/zip/samples/comment.rb @@ -4,10 +4,17 @@ # Create a zip file with comments! # -require 'zip' +msfbase = __FILE__ +while File.symlink?(msfbase) + msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase)) +end +inc = File.dirname(msfbase) + '/../../..' +$:.unshift(inc) + +require 'rex/zip' # example usage -zip = Zip::Archive.new +zip = Rex::Zip::Archive.new zip.add_file("elite.txt", "A" * 1024, nil, %Q< +---------------+ | file comment! | diff --git a/lib/rex/zip/samples/mkwar.rb b/lib/rex/zip/samples/mkwar.rb index a953202bca..6f7e031f0c 100755 --- a/lib/rex/zip/samples/mkwar.rb +++ b/lib/rex/zip/samples/mkwar.rb @@ -4,7 +4,15 @@ # Create a WAR archive! # -require 'zip' +msfbase = __FILE__ +while File.symlink?(msfbase) + msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase)) +end +inc = File.dirname(msfbase) + '/../../..' +$:.unshift(inc) + + +require 'rex/zip' def rand_text_alpha(len) @@ -30,7 +38,7 @@ var_payload = "var_payload" var_name = "var_name" -zip = Zip::Archive.new +zip = Rex::Zip::Archive.new # begin meta-inf/ minf = [ 0xcafe, 0x0003 ].pack('Vv') diff --git a/lib/rex/zip/samples/mkzip.rb b/lib/rex/zip/samples/mkzip.rb index f929f716f4..a238227f52 100755 --- a/lib/rex/zip/samples/mkzip.rb +++ b/lib/rex/zip/samples/mkzip.rb @@ -4,9 +4,16 @@ # Add a file from memory and save it. # -require 'zip' +msfbase = __FILE__ +while File.symlink?(msfbase) + msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase)) +end +inc = File.dirname(msfbase) + '/../../..' +$:.unshift(inc) + +require 'rex/zip' # example usage -zip = Zip::Archive.new +zip = Rex::Zip::Archive.new zip.add_file("elite.txt", "A" * 1024) zip.save_to("lolz.zip") diff --git a/lib/rex/zip/samples/recursive.rb b/lib/rex/zip/samples/recursive.rb index cf5ffd190c..3079a6cbe5 100755 --- a/lib/rex/zip/samples/recursive.rb +++ b/lib/rex/zip/samples/recursive.rb @@ -1,6 +1,13 @@ #!/usr/bin/env ruby -require 'zip' +msfbase = __FILE__ +while File.symlink?(msfbase) + msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase)) +end +inc = File.dirname(msfbase) + '/../../..' +$:.unshift(inc) + +require 'rex/zip' out = "test.zip" dir = "/var/www" @@ -46,6 +53,6 @@ def add_files(zip, path, recursive = nil) end -zip = Zip::Archive.new +zip = Rex::Zip::Archive.new add_files(zip, dir, TRUE) zip.save_to(out)