From 374e073d5e648f3506e646b015f3bbf3925c64f6 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 4 Jun 2018 18:05:08 +0300 Subject: move ssh-related stuff to ssh.sh spawn_ssh_agent no longer creates ~/.ssh_agent.sh, because in cron jobs it's pretty useless actually, since they are typically run when I'm not connected via ssh. --- %HOME%/.bash_profile | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to '%HOME%/.bash_profile') diff --git a/%HOME%/.bash_profile b/%HOME%/.bash_profile index fb2b58f..b42f274 100644 --- a/%HOME%/.bash_profile +++ b/%HOME%/.bash_profile @@ -2,25 +2,5 @@ echo "Welcome to $( hostname )" -kill_ssh_agent() { - [ -n "${SSH_AGENT_PID:+x}" ] && kill "$SSH_AGENT_PID" - local output_path="$HOME/.ssh_agent.sh" - rm -f -- "$output_path" -} - -spawn_ssh_agent() { - # This spawns ssh-agent and exports its variables to ~/.ssh_agent.sh, - # to be used in cron jobs and such. - local output_path="$HOME/.ssh_agent.sh" - [ -z "${SSH_AGENT_PID:+x}" ] \ - && command -v ssh-agent > /dev/null 2>&1 \ - && touch -- "$output_path" \ - && chmod 0600 -- "$output_path" \ - && ssh-agent -s > "$output_path" \ - && source "$output_path" > /dev/null \ - && [ -n "${SSH_AGENT_PID:+x}" ] \ - && echo "Spawned ssh-agent with PID: $SSH_AGENT_PID." \ - && trap kill_ssh_agent EXIT -} - -spawn_ssh_agent +command -v spawn_ssh_agent > /dev/null 2>&1 \ + && spawn_ssh_agent -- cgit v1.2.3