Fix panic on errors.As() (#25)

viamrobotics · Jun 10, 2024 · 0ae54b9 · 0ae54b9
1 parent 8848c83
commit 0ae54b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -6,8 +6,10 @@ else ifeq ($(GOARCH),arm64)
 LINUX_ARCH = aarch64
 endif
 
-GIT_REVISION = $(shell git rev-parse HEAD | tr -d '\n')
-TAG_VERSION ?= $(shell git tag --points-at | sort -Vr | head -n1 | cut -c2-)
+ifeq ($(shell git status -s),)
+	TAG_VERSION ?= $(shell git tag --points-at | sort -Vr | head -n1 | cut -c2-)
+	GIT_REVISION = $(shell git rev-parse HEAD | tr -d '\n')
+endif
 ifeq ($(TAG_VERSION),)
 PATH_VERSION = custom
 else

diff --git a/cmd/viam-agent/main.go b/cmd/viam-agent/main.go
@@ -186,7 +186,7 @@ func main() {
 				break
 			}
 
-			if errors.As(err, &exec.ExitError{}) {
+			if e := (&exec.ExitError{}); !errors.As(err, &e) {
 				// if it's not an ExitError, that means it didn't even start, so bail out
 				globalLogger.Error(errors.Wrap(err, "running 'systemctl is-active network-online.target'"))
 				break