Land #11339, Move command_exists? method to Msf::Post::Common

GSoC/Meterpreter_Web_Console
Brendan Coles 2019-02-01 16:07:47 +00:00
commit d9e3fb7d2c
No known key found for this signature in database
GPG Key ID: 3EB700FCFBA899B5
3 changed files with 15 additions and 21 deletions

View File

@ -235,6 +235,20 @@ module Msf::Post::Common
nil nil
end end
private #
# Checks if the `cmd` is installed on the system
# @return [Boolean]
#
def command_exists?(cmd)
if session.platform == 'windows'
# https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/where_1
# https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/if
cmd_exec("cmd /c where /q #{cmd} & if not errorlevel 1 echo true").to_s.include? 'true'
else
cmd_exec("command -v #{cmd} && echo true").to_s.include? 'true'
end
rescue
raise "Unable to check if command `#{cmd}' exists"
end
end end

View File

@ -225,16 +225,6 @@ module System
raise 'Unable to check for gcc' raise 'Unable to check for gcc'
end end
#
# Checks if the `cmd` is installed on the system
# @return [Boolean]
#
def command_exists?(cmd)
cmd_exec("command -v #{cmd} && echo true").to_s.include? 'true'
rescue
raise "Unable to check if command `#{cmd}` exists"
end
# #
# Gets the process id(s) of `program` # Gets the process id(s) of `program`
# @return [Array] # @return [Array]

View File

@ -118,16 +118,6 @@ module System
raise 'Unable to check for gcc' raise 'Unable to check for gcc'
end end
#
# Checks if the `cmd` is installed on the system
# @return [Boolean]
#
def command_exists?(cmd)
cmd_exec("command -v #{cmd} && echo true").to_s.include? 'true'
rescue
raise "Unable to check if command `#{cmd}` exists"
end
# #
# Gets the process id(s) of `program` # Gets the process id(s) of `program`
# @return [Array] # @return [Array]