Browse Source

Merge branch 'crash' into master

Heh I don't have a half bad memory!
crash2
Geoffrey Frogeye 2 years ago
parent
commit
35d4c10919
  1. BIN
      config/i3/pitch.png
  2. 6
      config/scripts/machines
  3. 8
      config/shell/shenv

BIN
config/i3/pitch.png

After

Width: 1  |  Height: 1  |  Size: 67 B

6
config/scripts/machines

@ -416,7 +416,11 @@ machines_n_help() { machines_network_help "$@"; }
function machines_update-all {
machines_machine_list | while read -r machine; do
echo "Updating $machine..."
ssh "$machine" 'cd .dotfiles && git pull; machines update' &
if [ $machine = $(cat "$MACHINES_CONFIG/this.name") ]; then
machines_update
continue
fi
ssh -n "$machine" 'cd .dotfiles; git pull; ./config/scripts/machines update'
done
}

8
config/shell/shenv

@ -106,10 +106,14 @@ prependpath "$HOME/.config/scripts"
prependpath "$HOME/.termux/bin"
)
# For superseding commands with better ones if they are present
if grep -q enable-ssh-support "$GNUPGHOME/gpg-agent.conf" 2> /dev/null
# SSH Agent
# If GPG agent is configured for SSH
if grep -q ^enable-ssh-support$ $GNUPGHOME/gpg-agent.conf 2> /dev/null
then
# Use GPG as SSH agent
# Load GPG agent
unset SSH_AGENT_PID
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"

Loading…
Cancel
Save