Merge pull request #652 from bahaa-ghazal/master

chore: Improving error message
mendersoftware · Dec 12, 2024 · dc20f03 · dc20f03
2 parents 550e69f + 7b1d576
commit dc20f03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cli/.gitignore b/cli/.gitignore
@@ -2,3 +2,4 @@ artifact_info
 input.mender.txt
 test.txt
 testkey
+artifact.mender
diff --git a/cli/artifact.mender b/cli/artifact.mender
diff --git a/cli/write.go b/cli/write.go
@@ -880,10 +880,13 @@ func getDeviceSnapshot(c *cli.Context) (string, error) {
 		args,
 		"/bin/sh",
 		"-c",
-		`'mender_snapshot="mender snapshot"`+
-			`; which mender-snapshot 1> /dev/null && mender_snapshot="mender-snapshot"`+
-			`; [ $(id -u) -eq 0 ] || sudo_cmd="sudo -S"`+
-			`; $sudo_cmd /bin/sh -c "echo `+sshInitMagic+`; $mender_snapshot dump" | cat'`,
+		`'[ $(id -u) -eq 0 ] || sudo_cmd="sudo -S"`+
+			`; if which mender-snapshot 1> /dev/null`+
+			`; then $sudo_cmd /bin/sh -c "echo `+sshInitMagic+`; mender-snapshot dump" | cat`+
+			`; elif which mender 1> /dev/null`+
+			`; then $sudo_cmd /bin/sh -c "echo `+sshInitMagic+`; mender snapshot dump" | cat`+
+			`; else echo "Mender not found: Please check that Mender is installed" >&2 &&`+
+			`exit 1; fi'`,
 	)
 
 	cmd := exec.Command("ssh", args...)