Merge pull request #345 from jmorganca/exit-non-zero

set non-zero error code on error

cmd/cmd.go

@@ -78,6 +78,7 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
 			spinner = NewSpinner(resp.Status)
 			go spinner.Spin(100 * time.Millisecond)
 		}
+
 		return nil
 	}
 
@@ -87,6 +88,9 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
 
 	if spinner != nil {
 		spinner.Stop()
+		if spinner.description != "success" {
+			return errors.New("unexpected end to create model")
+		}
 	}
 
 	return nil
@@ -155,6 +159,11 @@ func PushHandler(cmd *cobra.Command, args []string) error {
 	if err := client.Push(context.Background(), &request, fn); err != nil {
 		return err
 	}
+
+	if bar != nil && !bar.IsFinished() {
+		return errors.New("unexpected end to push model")
+	}
+
 	return nil
 }
 
@@ -253,12 +262,18 @@ func pull(model string, insecure bool) error {
 			currentDigest = ""
 			fmt.Println(resp.Status)
 		}
+
 		return nil
 	}
 
 	if err := client.Pull(context.Background(), &request, fn); err != nil {
 		return err
 	}
+
+	if bar != nil && !bar.IsFinished() {
+		return errors.New("unexpected end to pull model")
+	}
+
 	return nil
 }
 
@@ -325,6 +340,10 @@ func generate(cmd *cobra.Command, model, prompt string) error {
 		fmt.Println()
 		fmt.Println()
 
+		if !latest.Done {
+			return errors.New("unexpected end of response")
+		}
+
 		verbose, err := cmd.Flags().GetBool("verbose")
 		if err != nil {
 			return err
@@ -691,6 +710,7 @@ func NewCLI() *cobra.Command {
 		Use:           "ollama",
 		Short:         "Large language model runner",
 		SilenceUsage:  true,
+		SilenceErrors: true,
 		CompletionOptions: cobra.CompletionOptions{
 			DisableDefaultCmd: true,
 		},

main.go

@@ -4,8 +4,9 @@ import (
 	"context"
 
 	"github.com/jmorganca/ollama/cmd"
+	"github.com/spf13/cobra"
 )
 
 func main() {
-	cmd.NewCLI().ExecuteContext(context.Background())
+	cobra.CheckErr(cmd.NewCLI().ExecuteContext(context.Background()))
 }