File tree 3 files changed +6
-11
lines changed
3 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -71,7 +71,6 @@ type Config struct {
71
71
func GetDefaultConfig () * Config {
72
72
return & Config {
73
73
AuthenticationScheme : AuthenticationSchemeDefault ,
74
- AuthenticationFile : GetDefaultPasswordFilePath (),
75
74
ClientServerNegotiation : ClientServerNegotiationDefault ,
76
75
ClientServerPolicy : ClientServerPolicyDefault ,
77
76
Port : PortDefault ,
Original file line number Diff line number Diff line change @@ -150,11 +150,9 @@ func (manager *ICommandsEnvironmentManager) SetEnvironmentFilePath(envFilePath s
150
150
151
151
manager .EnvironmentDirPath = filepath .Dir (envFilePath )
152
152
manager .EnvironmentFilePath = envFilePath
153
+ manager .SessionFilePath = fmt .Sprintf ("%s.%d" , manager .EnvironmentFilePath , manager .PPID )
153
154
manager .PasswordFilePath = filepath .Join (manager .EnvironmentDirPath , passwordFilenameDefault )
154
155
155
- sessionFilePath := fmt .Sprintf ("%s.%d" , manager .EnvironmentFilePath , manager .PPID )
156
- manager .SessionFilePath = sessionFilePath
157
-
158
156
manager .Environment .AuthenticationFile = manager .PasswordFilePath
159
157
return nil
160
158
}
@@ -168,11 +166,9 @@ func (manager *ICommandsEnvironmentManager) SetEnvironmentDirPath(envDirPath str
168
166
169
167
manager .EnvironmentDirPath = envDirPath
170
168
manager .EnvironmentFilePath = filepath .Join (envDirPath , environmentFilenameDefault )
169
+ manager .SessionFilePath = fmt .Sprintf ("%s.%d" , manager .EnvironmentFilePath , manager .PPID )
171
170
manager .PasswordFilePath = filepath .Join (manager .EnvironmentDirPath , passwordFilenameDefault )
172
171
173
- sessionFilePath := fmt .Sprintf ("%s.%d" , manager .EnvironmentFilePath , manager .PPID )
174
- manager .SessionFilePath = sessionFilePath
175
-
176
172
manager .Environment .AuthenticationFile = manager .PasswordFilePath
177
173
return nil
178
174
}
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ func ExpandHomeDir(path string) (string, error) {
70
70
}
71
71
72
72
if path [0 ] != '~' {
73
- return path , nil
73
+ return filepath . Abs ( path )
74
74
}
75
75
76
76
homedir , err := os .UserHomeDir ()
@@ -80,16 +80,16 @@ func ExpandHomeDir(path string) (string, error) {
80
80
81
81
// resolve "~"
82
82
if len (path ) == 1 {
83
- return homedir , nil
83
+ return filepath . Abs ( homedir )
84
84
}
85
85
86
86
// resolve "~/"
87
87
if path [1 ] == '/' {
88
88
path = filepath .Join (homedir , path [2 :])
89
- return filepath .Clean (path ), nil
89
+ return filepath .Abs (path )
90
90
}
91
91
92
- return path , nil
92
+ return filepath . Abs ( path )
93
93
}
94
94
95
95
// ExistFile checks if file exists
You can’t perform that action at this time.
0 commit comments