rcmain: use new $termprog variable

mccoyst · rsc · commit 1889a2578366 · 2013-08-13T12:46:38.000-04:00
R=rsc CC=plan9port.codebot https://codereview.appspot.com/12505045
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -44,6 +44,7 @@ Roger Peppe <rogpeppe@gmail.com>
 Russ Cox <rsc@swtch.com>
 Sean McKean <smckean83@gmail.com>
 Shenghou Ma <minux.ma@gmail.com>
+Steve McCoy <mccoyst@gmail.com>
 Ties Bos <gitbisector@gmail.com>
 Tim Newsham <tim.newsham@gmail.com>
 Tony Lainson <t.lainson@gmail.com>
diff --git a/rcmain b/rcmain
@@ -23,7 +23,7 @@ if(! ~ $#cflag 0){
 	exit $status
 }
 if(flag i){
-	if(~ $TERM 9term){
+	if(~ $termprog 9term || ~ $termprog win){
 		fn cd {
 			# builtin cd $1 && flag i && awd
 			# is not sufficient when running in a subshell

-Original file line number
+Diff line change
 Russ Cox <[email protected]>
 Sean McKean <[email protected]>
 Shenghou Ma <[email protected]>
 +Steve McCoy <[email protected]>
 Ties Bos <[email protected]>
 Tim Newsham <[email protected]>
 Tony Lainson <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ if(! ~ $#cflag 0){`
`23`	`23`	`exit $status`
`24`	`24`	`}`
`25`	`25`	`if(flag i){`
`26`		`- if(~ $TERM 9term){`
	`26`	`+ if(~ $termprog 9term \|\| ~ $termprog win){`
`27`	`27`	`fn cd {`
`28`	`28`	`# builtin cd $1 && flag i && awd`
`29`	`29`	`# is not sufficient when running in a subshell`