diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-01 23:07:30 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-01 23:07:30 -0700 |
| commit | 5bb8d410b08bf36d1ff3f36257ac364080d80aa9 (patch) | |
| tree | 0a49e4d75f0da1afbbf047bbf39e18ab1615a0ab /src/monkeysphere-ssh-proxycommand | |
| parent | 0e5a29df930f53cacfb7526b166ca1c6d4fbd25a (diff) | |
Start modifications to output logging with LOG_LEVEL.
Diffstat (limited to 'src/monkeysphere-ssh-proxycommand')
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand index 780ff03..0e66e10 100755 --- a/src/monkeysphere-ssh-proxycommand +++ b/src/monkeysphere-ssh-proxycommand @@ -13,15 +13,22 @@ # established. Can be added to ~/.ssh/config as follows: # ProxyCommand monkeysphere-ssh-proxycommand %h %p +######################################################################## +SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"} +. "${SHARE}/common" || exit 1 + +######################################################################## + usage() { cat <<EOF >&2 usage: ssh -o ProxyCommand="$(basename $0) %h %p" ... EOF } -log() { - echo "$@" >&2 -} +######################################################################## + +# export the monkeysphere log level +export MONKEYSPHERE_LOG_LEVEL if [ "$1" = '--no-connect' ] ; then NO_CONNECT='true' @@ -34,9 +41,9 @@ PORT="$2" MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"} if [ -z "$HOST" ] ; then - log "host must be specified." + echo "Host not specified." >&2 usage - exit 1 + exit 255 fi if [ -z "$PORT" ] ; then PORT=22 @@ -88,7 +95,7 @@ if [ -z "$NO_CONNECT" ] ; then elif (which socat 2>/dev/null >/dev/null); then exec socat STDIO "TCP:$HOST:$PORT" else - log "Neither netcat nor socat found -- could not complete monkeysphere-ssh-proxycommand connection to $HOST:$PORT" - exit 1 + echo "Neither netcat nor socat found -- could not complete monkeysphere-ssh-proxycommand connection to $HOST:$PORT" >&2 + exit 255 fi fi |