Code cleanup: Remove unused argument

junegunn · Feb 15, 2024 · 7a72f1a · 7a72f1a
1 parent 208e556
commit 7a72f1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/reader.go b/src/reader.go
@@ -88,7 +88,7 @@ func (r *Reader) terminate() {
 func (r *Reader) restart(command string) {
 	r.event = int32(EvtReady)
 	r.startEventPoller()
-	success := r.readFromCommand(nil, command)
+	success := r.readFromCommand(command)
 	r.fin(success)
 }
 
@@ -101,7 +101,7 @@ func (r *Reader) ReadSource() {
 		if len(cmd) == 0 {
 			success = r.readFiles()
 		} else {
-			success = r.readFromCommand(nil, cmd)
+			success = r.readFromCommand(cmd)
 		}
 	} else {
 		success = r.readFromStdin()
@@ -171,15 +171,11 @@ func (r *Reader) readFiles() bool {
 	return fastwalk.Walk(&conf, ".", fn) == nil
 }
 
-func (r *Reader) readFromCommand(shell *string, command string) bool {
+func (r *Reader) readFromCommand(command string) bool {
 	r.mutex.Lock()
 	r.killed = false
 	r.command = &command
-	if shell != nil {
-		r.exec = util.ExecCommandWith(*shell, command, true)
-	} else {
-		r.exec = util.ExecCommand(command, true)
-	}
+	r.exec = util.ExecCommand(command, true)
 	out, err := r.exec.StdoutPipe()
 	if err != nil {
 		r.mutex.Unlock()

diff --git a/src/reader_test.go b/src/reader_test.go
@@ -22,7 +22,7 @@ func TestReadFromCommand(t *testing.T) {
 	}
 
 	// Normal command
-	reader.fin(reader.readFromCommand(nil, `echo abc&&echo def`))
+	reader.fin(reader.readFromCommand(`echo abc&&echo def`))
 	if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" {
 		t.Errorf("%s", strs)
 	}
@@ -47,7 +47,7 @@ func TestReadFromCommand(t *testing.T) {
 	reader.startEventPoller()
 
 	// Failing command
-	reader.fin(reader.readFromCommand(nil, `no-such-command`))
+	reader.fin(reader.readFromCommand(`no-such-command`))
 	strs = []string{}
 	if len(strs) > 0 {
 		t.Errorf("%s", strs)