Feedback on various issues about super-dollop HOT 2 CLOSED

diff --git a/cmd/encrypt.go b/cmd/encrypt.go
index 5ab9863..4143a93 100644
--- a/cmd/encrypt.go
+++ b/cmd/encrypt.go
@@ -26,12 +26,16 @@ var encCommand = &cobra.Command{
                note, _ := cmd.Flags().GetString("note")
                file, _ := cmd.Flags().GetString("file")
                isPrint, _ := cmd.Flags().GetBool("print")
+               var err error
                if note != "" {
-                       encryptString(note, isPrint)
+                       err = encryptString(note, isPrint)
                }
 
                if file != "" {
-                       encryptFile(file, isPrint)
+                       err = encryptFile(file, isPrint)
+               }
+               if err != nil {
+                       log.Fatal(err)
                }
        },
 }
@@ -47,7 +51,7 @@ func init() {
        encCommand.Flags().BoolP("print", "p", false, "-p")
 }
 
-func encryptString(value string, isPrint bool) {
+func encryptString(value string, isPrint bool) error {
        cmd := exec.Command("gpg", "--encrypt", "-r", gpgID, "--armor")
 
        isDone, _ := pterm.DefaultSpinner.Start()
@@ -110,7 +114,7 @@ func encryptString(value string, isPrint bool) {
        defer isDone.Success("Successfully encrypted and saved! ", status)
 }
 
-func encryptFile(filePath string, isPrint bool) {
+func encryptFile(filePath string, isPrint bool) error {
        cmd := exec.Command("gpg", "--encrypt", "--armor", "-r", gpgID, "-o", "/dev/stdout", filePath)
 
        out, err := cmd.Output()

--- a/cmd/encrypt.go
+++ b/cmd/encrypt.go
@@ -113,32 +113,40 @@ func encryptString(value string, isPrint bool) {
 func encryptFile(filePath string, isPrint bool) error {
 	cmd := exec.Command("gpg", "--encrypt", "--armor", "-r", gpgID, "-o", "/dev/stdout", filePath)
 
-	out, err := cmd.Output()
+	var err error
+	var stdout io.Reader
+	if stdout, err = cmd.StdoutPipe(); err != nil {
+		return err
+	}
 
+	err = cmd.Start()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
+	defer cmd.Wait()
 
-	result := string(out)
 	isDone, _ := pterm.DefaultSpinner.Start()
 
 	if isPrint {
-		fmt.Println(result)
-		return
+		stdout = io.TeeReader(stdout, os.Stdout)
 	}
 
-	readedResult := strings.NewReader(result)
 	fileName := filepath.Base(filePath)
 
 	bucketName := os.Getenv("MINIO_BUCKET_NAME")
 
-	status, err := Client.PutObject(bucketName, "/files/"+fileName+".asc", readedResult, int64(len(result)), minio.PutObjectOptions{
+	status, err := Client.PutObject(bucketName, "/files/"+fileName+".asc", stdout, -1, minio.PutObjectOptions{
 		ContentType: "application/pgp-encrypted",
 	})
 
 	if err != nil {
-		panic(err)
+		return err
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return err
 	}
 
 	isDone.Success("Successfully encrypted and saved! ", status)
+	return nil
 }