Merge d47d23ea3e4317734a911441d77c7799be08e10b into 38d036d96fd6760192ec5425f0f5e1d8fcd503eb

main.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"os/exec"
 	"os/user"
 	"path/filepath"
 	"runtime"
@@ -116,13 +115,7 @@ func main() {
 
 	// Set $SHELL if the user wants to
 	if *setshflag {
-		os.Setenv("SHELL", "hilbish")
+		os.Setenv("SHELL", os.Args[0])
-
-		path, err := exec.LookPath("hilbish")
-		if err == nil {
-			os.Setenv("SHELL", path)
-		}
-
 	}
 
 	lr = newLineReader("", false)