diff options
| -rw-r--r-- | .zshrc | 11 | ||||
| -rwxr-xr-x | scripts/git-auto-sync.sh | 2 |
2 files changed, 11 insertions, 2 deletions
@@ -130,7 +130,16 @@ export PATH="$PATH:$HOME/.cargo/bin" # Start ssh-agent if not running # export SSH_ASKPASS_REQUIRE="prefer" -eval $(keychain --quiet --quick --lockwait 60 --eval ~/.ssh/id_ed25519) +#eval $(keychain --quiet --quick --clear --lockwait 60 --eval ~/.ssh/id_ed25519) +# if [ -t 0 ] && ! ssh-add -l 2>/dev/null | grep -q -E "ed25519|id_ed25519"; then +# ssh-add ~/.ssh/id_ed25519 +# fi +if [[ -t 0 ]]; then + ssh-add -l >/dev/null 2>&1 + if [[ $? -eq 1 ]]; then + ssh-add ~/.ssh/id_ed25519 + fi +fi MARKER_FILE="/run/user/$(id -u)/autorun_once_marker" if [ ! -f "$MARKER_FILE" ]; then diff --git a/scripts/git-auto-sync.sh b/scripts/git-auto-sync.sh index 8ef1871..0b4aa0b 100755 --- a/scripts/git-auto-sync.sh +++ b/scripts/git-auto-sync.sh @@ -1,7 +1,7 @@ #!/bin/bash # Make sure my ssh key is loaded in ssh-agent for use when committing -eval $(keychain --quiet --eval $HOME/.ssh/id_ed25519) +#eval $(keychain --quiet --eval $HOME/.ssh/id_ed25519) REPOS=( "$HOME/personal/grimoire/" |