core: respect "~" in ssh config (#849)

abiosoft · web-flow · commit 3c3af247e13c · 2023-11-12T11:45:19.000+01:00
diff --git a/app/app.go b/app/app.go
@@ -497,9 +497,14 @@ func generateSSHConfig(modifySSHConfig bool) error {
 			continue
 		}
 
-		if words[0] == "Include" && words[1] == sshFileColima {
-			// already present
-			return nil
+		if words[0] == "Include" {
+			sshConfig := words[1]
+			sshConfig = strings.Replace(sshConfig, "~/", "$HOME/", 1)
+			sshConfig = os.ExpandEnv(sshConfig)
+			if sshConfig == sshFileColima {
+				// already present
+				return nil
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -497,9 +497,14 @@ func generateSSHConfig(modifySSHConfig bool) error {`
`497`	`497`	`continue`
`498`	`498`	`}`
`499`	`499`
`500`		`- if words[0] == "Include" && words[1] == sshFileColima {`
`501`		`- // already present`
`502`		`- return nil`
	`500`	`+ if words[0] == "Include" {`
	`501`	`+ sshConfig := words[1]`
	`502`	`+ sshConfig = strings.Replace(sshConfig, "~/", "$HOME/", 1)`
	`503`	`+ sshConfig = os.ExpandEnv(sshConfig)`
	`504`	`+ if sshConfig == sshFileColima {`
	`505`	`+ // already present`
	`506`	`+ return nil`
	`507`	`+ }`
`503`	`508`	`}`
`504`	`509`	`}`
`505`	`510`