From 913d6486ac645a375e9fefc74c95b6befbad09b6 Mon Sep 17 00:00:00 2001
From: TorchedSammy <38820196+TorchedSammy@users.noreply.github.com>
Date: Wed, 24 Mar 2021 20:58:31 -0400
Subject: [PATCH] fix: merge conflicts; dont set /bin/zsh explicitly unless
 used with flag (for neofetch to use hilbish :))

---
 main.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index c314184..4bc6d35 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ import (
 
 )
 
-const version = "0.0.12"
+const version = "0.2.0-dev"
 var l *lua.LState
 var prompt string
 var commands = map[string]bool{}
@@ -33,7 +33,11 @@ func main() {
 	parser := argparse.NewParser("hilbish", "A shell for lua and flower lovers")
 	verflag := parser.Flag("v", "version", &argparse.Options{
 		Required: false,
-		Help: "prints hilbish version",
+		Help: "Prints Hilbish version",
+	})
+	setshflag := parser.Flag("S", "set-shell-env", &argparse.Options{
+		Required: false,
+		Help: "Sets $SHELL to Hilbish's executed path",
 	})
 
 	err := parser.Parse(os.Args)
@@ -47,7 +51,7 @@ func main() {
 		os.Exit(0)
 	}
 
-	os.Setenv("SHELL", os.Args[0])
+	if *setshflag { os.Setenv("SHELL", os.Args[0]) }
 
 	input, err := os.ReadFile(".hilbishrc.lua")
 	if err != nil {