feat: improve install

.goreleaser.yaml

@@ -3,7 +3,7 @@ before:
     - go mod tidy
 builds:
   - main: ./cmd/goprompt
-    binary: frk
+    binary: goprompt
     env:
       - CGO_ENABLED=0
     goos:

README.md

@@ -24,20 +24,7 @@ And the main POC query/rendering logic is implemented in GO
 ## Install
 
 ```
-$ eval "$(gimme 1.18.3)"
+$ eval "$(gimme 1.20)"
 $ make install
-$ make setup >> ~/.zshrc
-```
-
-Assuming GoPrompt installed in `~/bin` and zsh func in `~/.local/share/zsh-funcs`
-
-`make setup` will add the following to your `~/.zshrc`:
-
-```
-# PROMPT_ASYNC_ZLE: ------------------------------------------------------------
-path+=( "$HOME/bin" )
-fpath+=( "$HOME/.local/share/zsh-funcs" )
-autoload -Uz promptinit
-promptinit && prompt_asynczle_setup
-# ------------------------------------------------------------------------------
+$ goprompt install zsh.zshrc >> ~/.zshrc
 ```

cmd/goprompt/cmdInstall.go

@@ -2,40 +2,52 @@ package main
 
 import (
 	"fmt"
+
+	goprompt "github.com/NonLogicalDev/shell.async-goprompt"
 	"github.com/spf13/cobra"
 )
 
+var installDesc = `
+To install run the following:
+
+	$ goprompt install zsh.zshrc >> .zshrc
+
+FILE options:
+
+	* zsh.zshrc
+	* zsh.plugin
+`
+
 var (
 	cmdInstall = &cobra.Command{
-		Use:   "install",
+		Use:   "install [FILE]",
 		Short: "install the integration",
+		Long: trim(installDesc),
+		Args: cobra.MinimumNArgs(1),
 	}
 )
 
+const (
+	_zshRc = "zshrc"
+	_zshPlugin = "zshplugin"
+)
+
 func init() {
 	cmdInstall.RunE = cmdInstallRun
 }
 
 // TODO: bundle in the plugin directory, and provide a way to extract it into users directory of choice.
 
 func cmdInstallRun(command *cobra.Command, args []string) error {
-	fmt.Println(`
-# SETUP:
-# ------------------------------------------------------------------------------
-# Assuming GoPrompt is installed in $(USR_BIN_DIR)
-# and zsh func in $(USR_ZSH_DIR)
-# ------------------------------------------------------------------------------
-# $$ make setup >> ~/.zshrc"
-# ------------------------------------------------------------------------------
-# Add this to your ~/.zshenv
-# ------------------------------------------------------------------------------
-
-# PROMPT_ASYNC_ZLE: ------------------------------------------------------------
-path+=( "$(USR_BIN_DIR)" )
-fpath+=( "$(USR_ZSH_DIR)" )
-autoload -Uz promptinit
-promptinit && prompt_asynczle_setup
-# ------------------------------------------------------------------------------
-	`)
+	var content string
+	switch args[0] {
+	case "zsh.zshrc":
+		f, _ := goprompt.ZSHPluginFiles.ReadFile("plugin/zsh/prompt_install.zsh")
+		content = string(f)
+	case "zsh.plugin":
+		f, _ := goprompt.ZSHPluginFiles.ReadFile("plugin/zsh/prompt_asynczle_setup.zsh")
+		content = string(f)
+	}
+	fmt.Println(content)
 	return nil
 }

cmd/goprompt/main.go

@@ -36,12 +36,12 @@ func debugLog(msg string, args ...[]interface{}) {
 func init() {
 	cmd.AddCommand(cmdQuery)
 	cmd.AddCommand(cmdRender)
+	cmd.AddCommand(cmdInstall)
 }
 
 func main() {
-
 	err := cmd.ExecuteContext(bgctx)
 	if err != nil {
-		panic(err)
+		os.Exit(1)
 	}
 }

plugin/zsh/prompt_install.zsh

@@ -0,0 +1,6 @@
+# PROMPT_ASYNC_ZLE: ------------------------------------------------------------
+if (($+commands[goprompt])); then
+	autoload -Uz promptinit
+	promptinit && eval "$(goprompt install zsh.plugin)"
+fi
+# ------------------------------------------------------------------------------

static.go

@@ -0,0 +1,8 @@
+package goprompt
+
+import "embed"
+
+var (
+	//go:embed plugin/zsh
+	ZSHPluginFiles embed.FS
+)