diff options
| author | Hans Nilsson <[email protected]> | 2017-03-02 12:11:06 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-03-02 12:11:06 +0100 |
| commit | 654f7791bd4c1248ed78401ebeade0f98a2250b3 (patch) | |
| tree | f95e79faadb151d4cb151592a16d535a8db79276 /lib/ssh/src/ssh_cli.erl | |
| parent | cf732330c011fb28f58c7e4c043381eac352a9fb (diff) | |
| parent | 931df53bc431c47140620864b04d4622f9e41421 (diff) | |
| download | otp-654f7791bd4c1248ed78401ebeade0f98a2250b3.tar.gz otp-654f7791bd4c1248ed78401ebeade0f98a2250b3.tar.bz2 otp-654f7791bd4c1248ed78401ebeade0f98a2250b3.zip | |
Merge branch 'hans/ssh/options_freshup/OTP-12872'
Diffstat (limited to 'lib/ssh/src/ssh_cli.erl')
| -rw-r--r-- | lib/ssh/src/ssh_cli.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl index 6f8c050486..4c4f61e036 100644 --- a/lib/ssh/src/ssh_cli.erl +++ b/lib/ssh/src/ssh_cli.erl @@ -499,14 +499,12 @@ start_shell(ConnectionHandler, State) -> [peer, user]), ShellFun = case is_function(Shell) of true -> - User = - proplists:get_value(user, ConnectionInfo), + User = proplists:get_value(user, ConnectionInfo), case erlang:fun_info(Shell, arity) of {arity, 1} -> fun() -> Shell(User) end; {arity, 2} -> - {_, PeerAddr} = - proplists:get_value(peer, ConnectionInfo), + {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo), fun() -> Shell(User, PeerAddr) end; _ -> Shell @@ -525,8 +523,7 @@ start_shell(ConnectionHandler, Cmd, #state{exec=Shell} = State) when is_function ConnectionInfo = ssh_connection_handler:connection_info(ConnectionHandler, [peer, user]), - User = - proplists:get_value(user, ConnectionInfo), + User = proplists:get_value(user, ConnectionInfo), ShellFun = case erlang:fun_info(Shell, arity) of {arity, 1} -> @@ -534,8 +531,7 @@ start_shell(ConnectionHandler, Cmd, #state{exec=Shell} = State) when is_function {arity, 2} -> fun() -> Shell(Cmd, User) end; {arity, 3} -> - {_, PeerAddr} = - proplists:get_value(peer, ConnectionInfo), + {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo), fun() -> Shell(Cmd, User, PeerAddr) end; _ -> Shell |