diff --git a/docker-rsync/agent-add b/docker-rsync/agent-add index d1f5b77..d0cf9f2 100755 --- a/docker-rsync/agent-add +++ b/docker-rsync/agent-add @@ -1,6 +1,6 @@ #!/bin/sh -set -euo pipefail +set -euo source agent-start "${1:-default}" cat - | tr -d '\r' | DISPLAY=1 SSH_ASKPASS=agent-askpass ssh-add - >/dev/null diff --git a/docker-rsync/agent-askpass b/docker-rsync/agent-askpass index 3757baf..f702547 100755 --- a/docker-rsync/agent-askpass +++ b/docker-rsync/agent-askpass @@ -1,5 +1,5 @@ #!/bin/sh -set -euo pipefail +set -euo echo "$SSH_PASS" diff --git a/docker-rsync/agent-start b/docker-rsync/agent-start index 1d3c425..3b21f36 100755 --- a/docker-rsync/agent-start +++ b/docker-rsync/agent-start @@ -1,6 +1,6 @@ #!/bin/sh -set -euo pipefail +set -euo FOLDER=${1:-default} STORE_PATH="/tmp/ssh-agent/$FOLDER" diff --git a/docker-rsync/agent-stop b/docker-rsync/agent-stop index 621f746..44f46cf 100755 --- a/docker-rsync/agent-stop +++ b/docker-rsync/agent-stop @@ -1,6 +1,6 @@ #!/bin/sh -set -euo pipefail +set -euo if [ ! -z "$SSH_AGENT_PID" ]; then # Here, the environment is set already, just kill the script. diff --git a/docker-rsync/hosts-add b/docker-rsync/hosts-add index 37dde9c..c2b3809 100755 --- a/docker-rsync/hosts-add +++ b/docker-rsync/hosts-add @@ -1,5 +1,5 @@ #!/bin/sh -set -euo pipefail +set -euo printf '%s\n' "$@" >> $HOME/.ssh/known_hosts diff --git a/docker-rsync/hosts-clear b/docker-rsync/hosts-clear index 7bddd05..c49c8e8 100755 --- a/docker-rsync/hosts-clear +++ b/docker-rsync/hosts-clear @@ -1,5 +1,5 @@ #!/bin/sh -set -euo pipefail +set -euo truncate -s 0 $HOME/.ssh/known_hosts diff --git a/docker-rsync/hosts-init b/docker-rsync/hosts-init index a47d64b..0afa35f 100755 --- a/docker-rsync/hosts-init +++ b/docker-rsync/hosts-init @@ -1,6 +1,6 @@ #!/bin/sh -set -euo pipefail +set -euo touch $HOME/.ssh/known_hosts chmod 600 $HOME/.ssh/known_hosts diff --git a/docker-rsync/ssh-init b/docker-rsync/ssh-init index 8f279ad..8a75b50 100755 --- a/docker-rsync/ssh-init +++ b/docker-rsync/ssh-init @@ -1,5 +1,5 @@ #!/bin/sh -set -euo pipefail +set -euo mkdir -m 700 $HOME/.ssh diff --git a/entrypoint.sh b/entrypoint.sh index 84bc5d5..0a2dcb1 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -euo pipefail +set -euo if [ "${INPUT_DEBUG:-false}" = "true" ]; then set -x