Mercurial > hg > config
comparison bin/setup-X.sh @ 573:1e1db18fb7fa
STUB: bin/setup-X.sh
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Thu, 16 Jan 2014 16:32:52 -0800 |
parents | 8d28fce0a6d6 |
children | 00f5e55cbce8 |
comparison
equal
deleted
inserted
replaced
572:980fd762e354 | 573:1e1db18fb7fa |
---|---|
22 # TODO: add workspace specific programs | 22 # TODO: add workspace specific programs |
23 | 23 |
24 # ssh-add | 24 # ssh-add |
25 if [[ `ssh-add -l` != *id_?sa* ]] | 25 if [[ `ssh-add -l` != *id_?sa* ]] |
26 then | 26 then |
27 SSH_ASKPASS=/usr/bin/ksshaskpass | 27 GUI_SSH_ASKPASS=/usr/bin/ksshaskpass |
28 if [[ -e $SSH_ASKPASS ]] | 28 if [[ -e "${GUI_SSH_ASKPASS}" ]] |
29 then | 29 then |
30 SSH_ASKPASS=${SSH_ASKPASS} ssh-add | 30 SSH_ASKPASS=${GUI_SSH_ASKPASS} ssh-add |
31 elif [[ -z "$PS1" ]] | |
32 # http://www.cyberciti.biz/faq/linux-unix-bash-check-interactive-shell/ | |
33 | |
34 echo "not running ssh-add: PS1 not found" | |
31 else | 35 else |
32 echo "not running ssh-add: ${SSH_ASKPASS} not found" | 36 ssh-add # interactive terminal |
33 fi | 37 fi |
34 fi | 38 fi |