Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added option to run resource script on startup #115

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Added option to run resource script on startup #115

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c10ae04
separate out ProcessCommand() from DoWork(), create ProcessResourceFi…
TheTechromancer Nov 20, 2018
028ceee
relative imports
TheTechromancer Nov 20, 2018
ba1297f
added resource file argument, relative imports
TheTechromancer Nov 20, 2018
034c2fd
changed imports to blacklanternsecurity github
TheTechromancer Nov 23, 2018
6d2b1fa
changed imports to blacklanternsecurity github
TheTechromancer Nov 23, 2018
0194171
calling ProcessResourceFile()
TheTechromancer Nov 23, 2018
e16cedd
getting syntax just right
TheTechromancer Nov 23, 2018
4b10e77
fine-tuning ProcessResourceFile()
TheTechromancer Nov 23, 2018
c4066a1
fine-tuning ProcessResourceFile()
TheTechromancer Nov 23, 2018
7beeab5
display readline prompt in ProcessResourceFile()
TheTechromancer Nov 23, 2018
d3b4b10
prettifying output in ProcessResourceFile()
TheTechromancer Nov 23, 2018
25239ae
updated readme for "-rc" parameter
TheTechromancer Nov 23, 2018
33e1a83
updated readme for "-rc" parameter
TheTechromancer Nov 23, 2018
d7fa3bd
switched github imports back to kgretzky
TheTechromancer Nov 23, 2018
0e9cdd8
merged terminal.go conflict
TheTechromancer Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
merged terminal.go conflict
  • Loading branch information
@TheTechromancer
TheTechromancer committed Nov 23, 2018
commit 0e9cdd85ac54f244a8c288cf37a1de0343a6bf58
4 changes: 3 additions & 1 deletion core/terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (t *Terminal) ProcessResourceFile(rc string) {

func (t *Terminal) ProcessCommand(line string) bool {

line = strings.TrimSpace(line)
line = strings.TrimSpace(line)

args, err := parser.Parse(line)
if err != nil {
Expand Down Expand Up @@ -164,6 +164,8 @@ func (t *Terminal) DoWork() {
t.cfg.refreshActiveHostnames()
t.updateCertificates("")

t.output("%s", t.sprintPhishletStatus(""))

for !do_quit {
line, err := t.rl.Readline()
if err == readline.ErrInterrupt {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.