More prompt bug fixes, back and use commands should work properly now

git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
unstable
David Rude 2011-07-24 18:41:23 +00:00
parent 6bf90f884e
commit 25bdbe6568
2 changed files with 5 additions and 4 deletions

View File

@ -224,8 +224,8 @@ class Core
driver.destack_dispatcher
# Restore the prompt
prompt = framework.datastore['Prompt']
prompt_char = framework.datastore['PromptChar']
prompt = framework.datastore['Prompt'] || "%undmsf%clr "
prompt_char = framework.datastore['PromptChar'] || ">"
driver.update_prompt("#{prompt}", prompt_char, true)
end
end
@ -1968,8 +1968,8 @@ class Core
mod.init_ui(driver.input, driver.output)
# Update the command prompt
prompt = framework.datastore['Prompt']
prompt_char = framework.datastore['PromptChar']
prompt = framework.datastore['Prompt'] || "%undmsf%clr "
prompt_char = framework.datastore['PromptChar'] || ">"
driver.update_prompt("#{prompt} #{mod.type}(%bld%red#{mod.shortname}%clr) ", prompt_char, true)
end

View File

@ -177,6 +177,7 @@ module Shell
input.prompt.gsub!(/%J/, framework.jobs.count.to_s)
input.prompt.gsub!(/%L/, Rex::Socket.source_address("50.50.50.50"))
input.prompt.gsub!(/%D/, ::Dir.getwd)
self.init_prompt = input.prompt
end
line = input.pgets()