Commit 275d2513 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Added ssh-copy-id script & simplify SSH aliases

parent d1b4bfe5

.profile

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ export HISTIGNORE="&:ls:[bf]g:d[fu]:exit" 
export WORKON_HOME=~/.virtualenvs

export FIGNORE='.o:.pyc:~:.swp:.swa'

export VIRTUAL_ENV_DISABLE_PROMPT=yes

export GIT_SSH=$HOME/.ssh/ssh

export GIT_SSH=$HOME/.ssh/bin/ssh

export EDITOR="$HOME/.vim/bin/vim.remote"

export GOROOT=$HOME/.local/go

export GOPATH=$HOME/.local/gopath
@@ -39,6 +39,9 @@ manage_path PATH /bin before check 
manage_path PATH /usr/bin before check

manage_path PATH /usr/local/bin before check



# SSH scripts

manage_path PATH ~/.ssh/bin before



# User-local paths

manage_path PATH ~/.local/bin before check

manage_path PATH ~/.local/go/bin before

.shell/aliases

+4 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ alias fgrep='~/.shell/bin/grep-auto-exclude fgrep -n' 
alias egrep='~/.shell/bin/grep-auto-exclude egrep -n'



# special SSH

alias ssh="ssh -F '${SSH_CONFIG:=`~/.ssh/ssh --make-config`}'"

alias scp="scp -F '${SSH_CONFIG:=`~/.ssh/ssh --make-config`}'"

. ~/.shell/lib/ssh.sh

make_config

alias ssh="ssh -F '${SSH_CONFIG}'"

alias scp="scp -F '${SSH_CONFIG}'"



# special vim

alias vim="FROM_ALIAS=yes $EDITOR"

.ssh/ssh→.ssh/bin/ssh

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ fi >&2 


case " $*" in

	*' -F'*) exec ${SSH_BIN} "$@" ;;

	' --make-config'*) 

		make_config

		echo "$SSH_CONFIG"

		;;

	*)

		make_config

		PATH="`dirname $0`:$PATH"; export PATH

.ssh/bin/ssh-copy-id

0 → 100755
+14 −0
Original line number Diff line number Diff line 
#!/bin/bash

set -eu



. ~/.shell/lib/ssh.sh



make_config



ssh() {

	${SSH_BIN} -F "$SSH_CONFIG" "$@"

}



export -f ssh

export SSH_BIN SSH_CONFIG

command ssh-copy-id "$@"