Merge pull request #33 from frozenkp/master

fix issue #32
TimothyYe · Apr 30, 2021 · 32a03a9 · 32a03a9
2 parents a151311 + 5584150
commit 32a03a9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/utils.go b/utils.go
@@ -227,12 +227,8 @@ func loadSingleKey(keyPath string, env *Environment) *SSHKey {
 		key.PrivateKey = path
 
 		parsedPath := ParsePath(filepath.Join(env.SSHPath, kt.KeyBaseName))
-		absPath, err := filepath.Abs(filepath.Join(env.SSHPath, parsedPath))
-		if err != nil {
-			return nil
-		}
 
-		if path == absPath {
+		if path == parsedPath {
 			key.IsDefault = true
 		}
 
@@ -267,6 +263,10 @@ func ParsePath(path string) string {
 			os.Exit(1)
 		}
 
+		if !filepath.IsAbs(originFile) {
+		        originFile = filepath.Join(filepath.Dir(path), originFile)
+                }
+
 		return originFile
 	}
 	return path