class: TerminalSession
changed:
#outputFromCommand:prompt:timeout:
#startCommand:in:environment:setupTerminalWith:terminatedAction:
--- a/TerminalSession.st Tue Nov 05 12:38:50 2013 +0100
+++ b/TerminalSession.st Wed Nov 06 17:22:04 2013 +0100
@@ -278,7 +278,7 @@
exitStatus := status.
OperatingSystem closePid:shellPid.
shellPid := nil.
- terminatedAction value
+ terminatedAction valueWithOptionalArgument:status
].
].
@@ -477,14 +477,12 @@
"/ the first line of output is the echo
firstLine := output first withoutLeadingSeparators.
firstLine ~= aCommand ifTrue:[
- OperatingSystem isMSWINDOWSlike ifFalse:[
+ (aCommand startsWith:firstLine) ifTrue:[
"/ sigh - it is sometimes truncated (to be investigated)
- (aCommand startsWith:firstLine) ifTrue:[
- self halt.
- ^ output.
- ].
self halt.
+ ^ output.
].
+ "/ self halt.
^ output.
].
^ output copyFrom:2
@@ -675,11 +673,11 @@
!TerminalSession class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/TerminalSession.st,v 1.17 2013-10-28 14:16:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/TerminalSession.st,v 1.18 2013-11-06 16:22:04 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/TerminalSession.st,v 1.17 2013-10-28 14:16:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/TerminalSession.st,v 1.18 2013-11-06 16:22:04 cg Exp $'
! !