main.go

@@ -16,7 +16,7 @@ import (
 	"golang.org/x/term"
 )
 
-const version = "0.4.0-dev.6"
+const version = "0.4.0-dev.5"
 
 var (
 	l *lua.LState
@@ -49,16 +49,13 @@ func main() {
 	_ = getopt.BoolLong("interactive", 'i', "Force Hilbish to be an interactive shell")
 
 	getopt.Parse()
+	args := getopt.Args()
 	interactiveflag := getopt.Lookup('i').Seen()
 
 	if *cmdflag == "" || interactiveflag {
 		interactive = true
 	}
 
-	if getopt.NArgs() > 0 {
-		interactive = false
-	}
-
 	if *verflag {
 		fmt.Printf("Hilbish v%s\n", version)
 		os.Exit(0)
@@ -100,13 +97,11 @@ func main() {
 	readline.LoadHistory(homedir + "/.hilbish-history")
 
 	RunInput(*cmdflag)
-	if getopt.NArgs() > 0 {
-		err := l.DoFile(getopt.Arg(0))
+	if len(args) > 0 {
+		err := l.DoFile(args[0])
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
 		}
-		os.Exit(0)
 	}
 
 	for interactive {