#15 add: also allow storing of multi-line commands in Atuin

Signed-off-by: Patrizio Bekerle <[email protected]>

CHANGELOG.md

@@ -1,6 +1,8 @@
 # QOwnNotes command-line snippet manager changelog
 
 ## v0.6.1
+- The `--atuin` flag now also add commands to [Atuin](https://atuin.sh/) for multi-line commands
+  (for [#15](https://github.com/qownnotes/qc/issues/15))
 - The `--color` flag now shows the command description in a calmer green, instead of red
   (for [#16](https://github.com/qownnotes/qc/issues/16))
 

cmd/exec.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"github.com/fatih/color"
@@ -68,16 +67,32 @@ func execute(cmd *cobra.Command, args []string) (err error) {
 		writeLastCmdFile(command)
 	}
 
-	// Check if the command has only a single line
-	if config.Flag.Atuin && !strings.Contains(command, "\n") {
-		escapedCommand := strconv.Quote(command)
-		command = `histid=$(atuin history start -- ` + escapedCommand + ")\n" + command +
+	// Add commands to the Atuin history
+	if config.Flag.Atuin {
+		escapedCommand := escapeCommandForShell(command)
+		command = `histid=$(atuin history start -- ` + escapedCommand + `` + ")\n" + command +
 			"\natuin history end --exit $? $histid"
 	}
 
 	return run(command, os.Stdin, os.Stdout)
 }
 
+// escapeCommandForShell escapes a command for use in a shell script.
+// It also works for multi-line commands.
+func escapeCommandForShell(command string) string {
+	// Trim and split the command into lines
+	lines := strings.Split(strings.Trim(command, "\n"), "\n")
+
+	// Quote each line individually and join with literal $'\n'
+	quotedLines := make([]string, len(lines))
+	for i, line := range lines {
+		// Use single quotes to avoid most escaping issues
+		quotedLines[i] = "'" + strings.ReplaceAll(line, "'", "'\"'\"'") + "'"
+	}
+
+	return strings.Join(quotedLines, "$'\\n'")
+}
+
 func init() {
 	RootCmd.AddCommand(execCmd)
 	execCmd.Flags().BoolVarP(&config.Flag.Color, "color", "", false,