Remove elvish-stub.

Makefile

@@ -3,26 +3,17 @@ PKG_COVERS := $(shell go list ./... | grep -v /vendor/ | grep "^github.com/elves
 COVER_MODE := count
 
 FIRST_GOPATH=$(shell go env GOPATH | cut -d: -f1)
-STUB := $(FIRST_GOPATH)/bin/elvish-stub
 
-default: get stub test
+default: get test
 
 get:
 	go get .
 
 generate:
 	go generate ./...
 
-stub: $(STUB)
-
-$(STUB): ./stubimpl/main.c
-	test -n $(FIRST_GOPATH)
-	mkdir -p $(FIRST_GOPATH)/bin
-	$(CC) ./stubimpl/main.c -o $@
-
-test: stub
+test:
 	go test $(PKGS)
-	: ./stubimpl/test.sh
 
 cover/%: %
 	mkdir -p cover
@@ -36,8 +27,8 @@ goveralls: cover/all
 	go get -u github.com/mattn/goveralls
 	$(FIRST_GOPATH)/bin/goveralls -coverprofile=cover/all -service=travis-ci \
 
-upload: get stub
-	tar cfz elvish.tar.gz -C $(FIRST_GOPATH)/bin elvish elvish-stub
+upload: get
+	tar cfz elvish.tar.gz -C $(FIRST_GOPATH)/bin elvish
 	test "$(TRAVIS_GO_VERSION)" = 1.7 -a "$(TRAVIS_PULL_REQUEST)" = false \
 		&& test -n "$(TRAVIS_TAG)" -o "$(TRAVIS_BRANCH)" = master \
 		&& curl http://ul.elvish.io:6060/ -F name=elvish-$(TRAVIS_OS_NAME).tar.gz \
@@ -46,4 +37,4 @@ upload: get stub
 
 travis: goveralls upload
 
-.PHONY: default get generate stub test goveralls upload travis
+.PHONY: default get generate test goveralls upload travis

README.md

@@ -150,7 +150,7 @@ Elvish mimics bash and zsh in a lot of places. The following shows some key diff
 
 Go >= 1.6 is required. Linux is fully supported. It is likely to work on BSDs and Mac OS X. Windows is **not** supported yet.
 
-The main binary can be installed using `go get github.com/elves/elvish`. There is also an auxiliary program called elvish-stub; install it with `make stub`. Elvish is functional without the stub, but job control features depend on it.
+Elvish is a go-gettable package, and can be installed using `go get github.com/elves/elvish`.
 
 If you are lazy and use `bash` or `zsh` now, here is something you can copy-paste into your terminal:
 
@@ -160,7 +160,6 @@ export PATH=$PATH:$GOPATH/bin
 mkdir -p $GOPATH
 
 go get github.com/elves/elvish
-make -C $GOPATH/src/github.com/elves/elvish stub
 
 for f in ~/.bashrc ~/.zshrc; do
     printf 'export %s=%s\n' GOPATH '$HOME/go' PATH '$PATH:$GOPATH/bin' >> $f

eval/builtin-fn.go

@@ -1169,7 +1169,4 @@ func preExit(ec *EvalCtx) {
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 	}
-	if ec.Stub != nil {
-		ec.Stub.Terminate()
-	}
 }

eval/compile_op.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 
 	"github.com/elves/elvish/parse"
-	"github.com/elves/elvish/stub"
 )
 
 // Op is an operation on an EvalCtx.
@@ -41,14 +40,7 @@ func (cp *compiler) pipeline(n *parse.Pipeline) OpFunc {
 		bg := n.Background
 		if bg {
 			ec = ec.fork("background job " + n.SourceText())
-
-			// Set up a new stub.
-			st, err := stub.NewStub(os.Stderr)
-			if err != nil {
-				throwf("failed to spawn stub: %v", err)
-			}
-			st.SetTitle(n.SourceText())
-			ec.Stub = st
+			ec.intCh = nil
 
 			if ec.Editor != nil {
 				// TODO: Redirect output in interactive mode so that the line
@@ -104,7 +96,6 @@ func (cp *compiler) pipeline(n *parse.Pipeline) OpFunc {
 			// Background job, wait for form termination asynchronously.
 			go func() {
 				wg.Wait()
-				ec.Stub.Terminate()
 				msg := "job " + n.SourceText() + " finished"
 				if !allok(errors) {
 					msg += ", errors = " + makeCompositeError(errors).Error()

eval/eval.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/elves/elvish/parse"
 	"github.com/elves/elvish/store"
-	"github.com/elves/elvish/stub"
 	"github.com/elves/elvish/sys"
 	"github.com/elves/elvish/util"
 )
@@ -40,7 +39,6 @@ type Evaler struct {
 	Modules map[string]Namespace
 	Store   *store.Store
 	Editor  Editor
-	Stub    *stub.Stub
 	intCh   chan struct{}
 }
 
@@ -65,7 +63,7 @@ func (ec *EvalCtx) falsify() {
 
 // NewEvaler creates a new Evaler.
 func NewEvaler(st *store.Store) *Evaler {
-	return &Evaler{Namespace{}, map[string]Namespace{}, st, nil, nil, nil}
+	return &Evaler{Namespace{}, map[string]Namespace{}, st, nil, nil}
 }
 
 func (e *Evaler) searchPaths() []string {
@@ -166,47 +164,32 @@ func (ev *Evaler) Eval(op Op, name, text string) error {
 		{File: os.Stderr, Chan: BlackholeChan},
 	}
 
-	signal.Ignore(syscall.SIGTTIN)
-	signal.Ignore(syscall.SIGTTOU)
+	// signal.Ignore(syscall.SIGTTIN)
+	// signal.Ignore(syscall.SIGTTOU)
 	stopSigGoroutine := make(chan struct{})
 	sigGoRoutineDone := make(chan struct{})
-	// XXX Should use fd of /dev/terminal instead of 0.
-	if ev.Stub != nil && ev.Stub.Alive() && sys.IsATTY(0) {
-		ev.Stub.SetTitle(summarize(text))
-		dir, err := os.Getwd()
-		if err != nil {
-			dir = "/"
-		}
-		ev.Stub.Chdir(dir)
-		err = sys.Tcsetpgrp(0, ev.Stub.Process().Pid)
-		if err != nil {
-			fmt.Println("failed to put stub in foreground:", err)
-		}
-
-		ev.intCh = make(chan struct{})
-		go func() {
-			closedIntCh := false
-		loop:
-			for {
-				select {
-				case sig := <-ev.Stub.Signals():
-					switch sig {
-					case syscall.SIGINT, syscall.SIGQUIT:
-						if !closedIntCh {
-							close(ev.intCh)
-							closedIntCh = true
-						}
-					}
-				case <-stopSigGoroutine:
-					break loop
+	// Set up intCh.
+	ev.intCh = make(chan struct{})
+	sigCh := make(chan os.Signal)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGQUIT)
+	go func() {
+		closedIntCh := false
+	loop:
+		for {
+			select {
+			case <-sigCh:
+				if !closedIntCh {
+					close(ev.intCh)
+					closedIntCh = true
 				}
+			case <-stopSigGoroutine:
+				break loop
 			}
-			ev.intCh = nil
-			close(sigGoRoutineDone)
-		}()
-	} else {
+		}
+		ev.intCh = nil
+		signal.Stop(sigCh)
 		close(sigGoRoutineDone)
-	}
+	}()
 
 	ret, err := ev.eval(op, ports, name, text)
 	close(outCh)
@@ -218,7 +201,8 @@ func (ev *Evaler) Eval(op Op, name, text string) error {
 		fmt.Println(falseIndicator)
 	}
 
-	// XXX Should use fd of /dev/tty instead of 0.
+	// Put myself in foreground, in case some command has put me in background.
+	// XXX Should probably use fd of /dev/tty instead of 0.
 	if sys.IsATTY(0) {
 		err := sys.Tcsetpgrp(0, syscall.Getpgrp())
 		if err != nil {

eval/external_cmd.go

@@ -66,10 +66,6 @@ func (e ExternalCmd) Call(ec *EvalCtx, argVals []Value, opts map[string]Value) {
 	}
 
 	sys := syscall.SysProcAttr{}
-	if ec.Stub != nil && ec.Stub.Alive() {
-		sys.Setpgid = true
-		sys.Pgid = ec.Stub.Process().Pid
-	}
 	attr := syscall.ProcAttr{Env: os.Environ(), Files: files[:], Sys: &sys}
 
 	path, err := ec.Search(e.Name)

run/run.go

@@ -18,7 +18,6 @@ import (
 	"github.com/elves/elvish/eval"
 	"github.com/elves/elvish/parse"
 	"github.com/elves/elvish/store"
-	"github.com/elves/elvish/stub"
 	"github.com/elves/elvish/sys"
 	"github.com/elves/elvish/util"
 )
@@ -83,17 +82,6 @@ func Main() {
 		}
 	}()
 
-	stub, err := stub.NewStub(os.Stderr)
-	if err != nil {
-		fmt.Println("failed to spawn stub:", err)
-	} else {
-		ev.Stub = stub
-		go func() {
-			<-stub.State()
-			fmt.Println("stub has died")
-		}()
-	}
-
 	if len(args) == 1 {
 		if *cmd {
 			evalText(ev, "code from -c", args[0])