Merge branch 'master' of github.com:mborho/rem

.github/workflows/go.yml

@@ -3,10 +3,10 @@ name: Go
 on:
   push:
     branches: 
-    - "*"
+    - "**"
   pull_request:
     branches: 
-    - "*"
+    - "**"
 
 jobs:
 

cli.go

@@ -27,6 +27,7 @@ var (
 	helpFlag   *bool
 	addFlag    *bool
 	tagFlag    *string
+	printFlag  *bool
 	filter     *string
 )
 
@@ -36,6 +37,7 @@ func init() {
 	helpFlag = flag.Bool("h", false, "show this help")
 	addFlag = flag.Bool("a", false, "add a command")
 	tagFlag = flag.String("t", "", "tag for command")
+	printFlag = flag.Bool("p", false, "print command before executing")
 	filter = flag.String("f", "", "List commands by regexp filter.")
 }
 
@@ -49,6 +51,7 @@ func run(remfile string) error {
 			filename: remfile,
 			global:   *globalFlag,
 		},
+		printBeforeExec: *printFlag,
 	}
 	rem.read()
 

help.go

@@ -44,6 +44,7 @@ COMMANDS:
 FLAGS:
     -g - Use global rem file ~/.rem
     -t - Tag for command when adding with -a/add.
+    -p - Print command to stdout before executing index/tag.
 
 EXAMPLES:
     rem add ls -la - Adds "ls -la" to list.

line.go

@@ -45,7 +45,7 @@ func (l *Line) read(line string) {
 	}
 }
 
-func (l *Line) execute() error {
+func (l *Line) execute(printCmd bool) error {
 	// get the pid of the calling shell
 	pr, err := ps.FindProcess(os.Getppid())
 	if err != nil {
@@ -63,6 +63,11 @@ func (l *Line) execute() error {
 		l.execFlag = "-c"
 	}
 
+	// print cmd before executing
+	if printCmd == true {
+		fmt.Println(l.cmd)
+	}
+
 	// /bin/bash -c "ls -la"
 	execParts := []string{callerPath, l.execFlag, l.cmd}
 

rem.go

@@ -28,9 +28,10 @@ import (
 )
 
 type Rem struct {
-	path    string
-	lines   []*Line
-	hasTags bool
+	path            string
+	lines           []*Line
+	hasTags         bool
+	printBeforeExec bool
 	File
 }
 
@@ -56,13 +57,13 @@ func (r *Rem) executeIndex(index int) error {
 	if err != nil {
 		return err
 	}
-	return line.execute()
+	return line.execute(r.printBeforeExec)
 }
 
 func (r *Rem) executeTag(tag string) error {
 	for _, line := range r.lines {
 		if line.tag == tag {
-			return line.execute()
+			return line.execute(r.printBeforeExec)
 		}
 	}
 	return errors.New("Tag not found.")