dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
mumbai 2017-10-17 21:16:47 -04:00
parent 7098372f58 60a7a80ff0
commit 2f98f2bc2a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rex/ui/text/shell.rb
View File

@ -42,7 +42,7 @@ module Shell
# Set the stop flag to false
self.stop_flag = false
self.disable_output = false
self.stop_count = 0
self.stop_count = 0
# Initialize the prompt
self.init_prompt = prompt
@ -132,9 +132,10 @@ module Shell
if framework
if input.prompt.include?("%T")
t = Time.now
if framework.datastore['PromptTimeFormat']
t = t.strftime(framework.datastore['PromptTimeFormat'])
end
# This %T is the strftime shorthand for %H:%M:%S
format = framework.datastore['PromptTimeFormat'] || "%T"
t = t.strftime(format)
# This %T is the marker in the prompt where we need to place the time
input.prompt.gsub!(/%T/, t.to_s)
end