jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add logging

Browse source
This commit is contained in:
Jakobus Schürz 2020-09-21 23:31:11 +02:00
parent d46ed5a503
commit 4f41228b94
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/ssh-agent-start-or-restart
View file

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
SCRIPTENTRY
[ -z "${SSH_IDENTITIES_DIR+x}" ] && { SSH_IDENTITIES_DIR="${SSH_IDENTITIES_DEFAULT_DIR-${HOME}/.ssh/identities}"; export SSH_IDENTITIES_DIR; } [ -z "${SSH_IDENTITIES_DIR+x}" ] && { SSH_IDENTITIES_DIR="${SSH_IDENTITIES_DEFAULT_DIR-${HOME}/.ssh/identities}"; export SSH_IDENTITIES_DIR; }
[ -z "${SSH_AGENTS_DIR+x}" ] && { SSH_AGENTS_DIR=${SSH_AGENTS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENTS_DIR; } [ -z "${SSH_AGENTS_DIR+x}" ] && { SSH_AGENTS_DIR=${SSH_AGENTS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENTS_DIR; }
[ -z "${SSH_AGENT_SOCKETS_DIR+x}" ] && { SSH_AGENT_SOCKETS_DIR=${SSH_AGENT_SOCKETS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENT_SOCKETS_DIR; } [ -z "${SSH_AGENT_SOCKETS_DIR+x}" ] && { SSH_AGENT_SOCKETS_DIR=${SSH_AGENT_SOCKETS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENT_SOCKETS_DIR; }
@ -11,6 +12,7 @@ logdebug "SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR" >&2
[ -z "${SSH_IDENTITIES_DIR-x}" ] || mkdir -vp "$SSH_IDENTITIES_DIR" [ -z "${SSH_IDENTITIES_DIR-x}" ] || mkdir -vp "$SSH_IDENTITIES_DIR"
agent-start-or-restart () { agent-start-or-restart () {
ENTRY
local ssh_identity local ssh_identity
local agentfile local agentfile
local agentsocket local agentsocket
@ -59,11 +61,13 @@ agent-start-or-restart () {
return 1 return 1
fi fi
EXIT
} }
agent-load-identity-keys () { agent-load-identity-keys () {
ENTRY
local ssh_identity local ssh_identity
local agentfile local agentfile
local agentsocket local agentsocket
@ -106,10 +110,13 @@ agent-load-identity-keys () {
fi fi
done done
fi fi
EXIT
} }
ssh-runinagent () { ssh-runinagent () {
ENTRY
local agentfile local agentfile
local command local command
agentfile=${1} agentfile=${1}
@ -119,13 +126,18 @@ ssh-runinagent () {
logtrace "run command »$sshcommand« in agent $agentfile" >&2 logtrace "run command »$sshcommand« in agent $agentfile" >&2
if [ -e "$agentfile" ]; then if [ -e "$agentfile" ]; then
/bin/sh -c "unset SSH_AUTH_SOCK SSH_AGENT_PID; . $agentfile >/dev/null 2>/dev/null; $sshcommand" /bin/sh -c "unset SSH_AUTH_SOCK SSH_AGENT_PID; . $agentfile >/dev/null 2>/dev/null; $sshcommand"
EXIT
return $? return $?
else else
logwarn "agentfile not existent" >&2 logwarn "agentfile not existent" >&2
EXIT
return 1 return 1
fi fi
} }
agent-start-or-restart $1 agent-start-or-restart $1
agent-load-identity-keys $1 agent-load-identity-keys $1
SCRIPTEXIT
exit $? exit $?