Fixing string matching and line behavior in shell.
Authored by: m0slevin 2016-11-08
Parent: [r387]
Child: [r389]
