fix(cmd/tracerunner): change program path before than writing

Signed-off-by: Lorenzo Fontana <lo@linux.com>

Makefile

@@ -4,7 +4,7 @@ GO ?= go
 DOCKER ?= docker
 
 COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
-GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
+GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO})
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 

pkg/cmd/tracerunner.go

@@ -77,11 +77,14 @@ func (o *TraceRunnerOptions) Run() error {
 			return fmt.Errorf("invalid pid found")
 		}
 		f, err := ioutil.ReadFile(programPath)
+		if err != nil {
+			return err
+		}
+		programPath = path.Join(os.TempDir(), "program-container.bt")
 		r := strings.Replace(string(f), "$container_pid", *pid, -1)
 		if err := ioutil.WriteFile(programPath, []byte(r), 0755); err != nil {
 			return err
 		}
-		programPath = path.Join(os.TempDir(), "program-container.bt")
 	}
 
 	c := exec.Command(o.bpftraceBinaryPath, o.programPath)

pkg/version/version.go

@@ -17,6 +17,10 @@ func GitCommit() string {
 }
 
 func ImageNameTag() string {
+	commit := GitCommit()
+	if len(commit) == 0 {
+		return fmt.Sprintf(imageNameTagFormat, "latest")
+	}
 	return fmt.Sprintf(imageNameTagFormat, GitCommit())
 }