mirror of
https://github.com/Burnett01/rsync-deployments.git
synced 2024-11-23 16:03:46 +01:00
Add default paths. Shortern full path.
This commit is contained in:
parent
fa30c8125a
commit
73618b6bfb
2 changed files with 11 additions and 16 deletions
13
agent-start
13
agent-start
|
@ -1,17 +1,12 @@
|
|||
#!/bin/sh
|
||||
|
||||
STORE_PATH=/tmp
|
||||
if [ ! -z "$1" ]; then
|
||||
# This allows us to work with things like gitlab.
|
||||
# where the same thing might be running concurrently.
|
||||
# If default, it only stores in /tmp/, but if a path is added, it's interpolated.
|
||||
STORE_PATH="$STORE_PATH/$1"
|
||||
FOLDER=${1:-default}
|
||||
STORE_PATH="/tmp/ssh-agent/$FOLDER"
|
||||
mkdir -p "$STORE_PATH"
|
||||
fi
|
||||
|
||||
# Start the SSH agent if it isn't already.
|
||||
if [ -z "$SSH_AGENT_PID" ]; then
|
||||
eval "$(ssh-agent)" > /dev/null
|
||||
echo "$SSH_AGENT_PID" > "$STORE_PATH"/ssh-agent-id
|
||||
echo "$SSH_AUTH_SOCK" > "$STORE_PATH"/ssh-auth-sock
|
||||
echo "$SSH_AGENT_PID" > "$STORE_PATH"/id
|
||||
echo "$SSH_AUTH_SOCK" > "$STORE_PATH"/sock
|
||||
fi
|
||||
|
|
12
agent-stop
12
agent-stop
|
@ -6,10 +6,8 @@ if [ ! -z "$SSH_AGENT_PID" ]; then
|
|||
exit $?
|
||||
else
|
||||
# The env isn't set, construct the file path.
|
||||
STORE_PATH=/tmp
|
||||
if [ ! -z "$1" ]; then
|
||||
STORE_PATH="$STORE_PATH/$1"
|
||||
fi
|
||||
FOLDER=${1:-default}
|
||||
STORE_PATH="/tmp/ssh-agent/$FOLDER"
|
||||
if [ ! -d "$STORE_PATH" ]; then
|
||||
echo "Store Path $STORE_PATH doesn't exist!" >&2
|
||||
exit 1
|
||||
|
@ -18,14 +16,16 @@ else
|
|||
# And check our files exist.
|
||||
if [ -f "$STORE_PATH/ssh-agent-id" ]; then
|
||||
# Grab our PID and socket.
|
||||
SSH_AGENT_PID=$(cat "$STORE_PATH/ssh-agent-id")
|
||||
SSH_AGENT_PID=$(cat "$STORE_PATH/id")
|
||||
export SSH_AGENT_PID
|
||||
rm "$STORE_PATH/ssh-agent-id"
|
||||
|
||||
SSH_AUTH_SOCK=$(cat "$STORE_PATH/ssh-auth-sock")
|
||||
SSH_AUTH_SOCK=$(cat "$STORE_PATH/sock")
|
||||
export SSH_AUTH_SOCK
|
||||
rm "$STORE_PATH/ssh-auth-sock"
|
||||
|
||||
|
||||
rmdir "$STORE_PATH"
|
||||
eval $(ssh-agent -k) >/dev/null
|
||||
exit $?
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue