Adding error message when sock file exists

benpye · Nov 21, 2020 · 18e270c · 18e270c
1 parent e52845a
commit 18e270c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -239,14 +239,16 @@ func main() {
 	}()
 
 	if *unixSocket != "" {
-		if *force {
-			// If the socket file already exists then unlink it
-			_, err := os.Stat(*unixSocket)
-			if err == nil || !os.IsNotExist(err) {
+		_, err := os.Stat(*unixSocket)
+		if err == nil || !os.IsNotExist(err) {
+			if *force {
+				// If the socket file already exists then unlink it
 				err = syscall.Unlink(*unixSocket)
 				if err != nil {
 					log.Fatalf("Failed to unlink socket %s, error '%s'\n", *unixSocket, err)
 				}
+			} else {
+				log.Fatalf("Error: the SSH_AUTH_SOCK file already exists. Please delete it manually or use --force option.")
 			}
 		}