Skip to content

Commit

Permalink
Remove old tpope-hostman references
Browse files Browse the repository at this point in the history
In some cases I've chosen to use tpope-host rather than tpope host, because
every little time savings helps.
  • Loading branch information
tpope committed Oct 5, 2012
1 parent 3086631 commit 2dac5b2
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .bashrc
Expand Up @@ -18,8 +18,8 @@ set -o noclobber
export HISTCONTROL=ignoredups
unset HISTFILE

if [ -x "$HOME/bin/tpope" ]; then
hostcolor=`"$HOME/bin/tpope" hostman ansi`
if [ -x "$HOME/bin/tpope-host" ]; then
hostcolor=`tpope-host ansi`
else
hostcolor="01;37"
fi
Expand Down Expand Up @@ -78,7 +78,7 @@ _tpope() {
local selector=$(egrep "^ ([a-z-]*[|])*$sub([|][a-z-]*)*[)] *# *[_a-z-]*$" "$HOME/bin/$cmd" | sed -e 's/.*# *//')
case "$selector" in
hosts|ssh)
COMPREPLY=($(compgen -W "localhost $(tpope hostman list)" "$cur")) ;;
COMPREPLY=($(compgen -W "localhost $(tpope-host list)" "$cur")) ;;
services)
_services ;;
directories)
Expand Down
6 changes: 3 additions & 3 deletions .cshrc
Expand Up @@ -51,7 +51,7 @@ if ( -x /usr/bin/lesspipe ) then
else
setenv LESSOPEN '|"$HOME/.lessfilter" %s'
endif
if ( ! $?HOST ) set HOST = `tpope hostman name`
if ( ! $?HOST ) set HOST = `tpope-host name`
setenv LYNX_CFG "$HOME/.lynx.cfg"

set noclobber
Expand All @@ -75,8 +75,8 @@ else
endif

if ( $?tcsh ) then
if ( -x "$HOME/bin/tpope" ) then
set hostcolor = `$HOME/bin/tpope hostman ansi`
if ( -x "$HOME/bin/tpope-host" ) then
set hostcolor = `tpope-host ansi`
else
set hostcolor = `00;33`
endif
Expand Down
16 changes: 8 additions & 8 deletions .fvwm/.fvwm2rc
Expand Up @@ -25,7 +25,7 @@ DesktopName 5 Sixth
DesktopName 6 Seventh
DesktopName 7 Eighth

PipeRead "echo SetEnv HOST `tpope hostman`"
PipeRead "echo SetEnv HOST `tpope host name`"
PipeRead "echo SetEnv sudo `if [ -x /usr/bin/gksudo ]; then echo gksudo; else echo sudo; fi`"

SetEnv SMALLFONT "-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1"
Expand Down Expand Up @@ -261,7 +261,7 @@ Style emacs UseStyle Editor
# }}}2
# Host Specific Styles {{{2

PipeRead "$HOME/bin/tpope hostman fvwm-styles"
PipeRead "$HOME/bin/tpope host fvwm-styles"
PipeRead "echo 'Style *localhost UseStyle' \\*@`hostname|sed -e 's/[.].*//'`\\*"
PipeRead "echo 'Style @localhost UseStyle' @`hostname|sed -e 's/[.].*//'`\\*"

Expand Down Expand Up @@ -1367,7 +1367,7 @@ Test (x cdcd) + "&Disc Tracks%menu/disk-cd.xpm%" Popup MenuCDTracks
# }}}2
# Remote Logins and Screens {{{2

PipeRead "$HOME/bin/tpope hostman fvwm-menus"
PipeRead "$HOME/bin/tpope host fvwm-menus"

# }}}2
# Fvwm Menus {{{2
Expand Down Expand Up @@ -1494,7 +1494,7 @@ pid=\"`xprop -id $[w.id] _NET_WM_PID|sed -e 's/.* = //'`\"; \
if [ \"\$host\" = \"\$HOST\" ]; then \
echo Exec kill -$0 \$pid; \
else \
echo Exec tpope hostman ssh \"\$host\" -ax kill -$0 \$pid; \
echo Exec tpope host ssh \"\$host\" -ax kill -$0 \$pid; \
fi
"

Expand Down Expand Up @@ -1842,7 +1842,7 @@ AddToFunc FuncScreenXTerm

DestroyFunc FuncSshXTerm
AddToFunc FuncSshXTerm
+ I Exec exec x-terminal-emulator -ut -name ssh@$0 -T ssh@$0 -e tpope hostman ssh $0 -tX
+ I Exec exec x-terminal-emulator -ut -name ssh@$0 -T ssh@$0 -e tpope host ssh $0 -tX

DestroyFunc FuncFindXTerm
AddToFunc FuncFindXTerm
Expand All @@ -1851,7 +1851,7 @@ AddToFunc FuncFindXTerm
DestroyFunc FuncScreenSshXTerm
AddToFunc FuncScreenSshXTerm
+ I FuncFindResource @$0
+ I None (@$0, AcceptsFocus) Exec exec x-terminal-emulator -ut -name @$0 -T @$0 -e tpope hostman ssh $0 -t screen -dRR $[HOST]
+ I None (@$0, AcceptsFocus) Exec exec x-terminal-emulator -ut -name @$0 -T @$0 -e tpope host ssh $0 -t screen -dRR $[HOST]

# }}}2
# Menu Functions {{{2
Expand Down Expand Up @@ -2173,7 +2173,7 @@ DestroyModuleConfig FvwmForm-Run: *
*FvwmForm-Run: Input Host 22 ""
*FvwmForm-Run: Line expand
*FvwmForm-Run: Button quit "Run" ^M
*FvwmForm-Run: Command Exec case "$(Program)" in '') exec x-terminal-emulator $(Host?-ut -name @$(Host) -T @$(Host))$(Host!-name @localhost -T @localhost tpope) -e $(Host?tpope hostman ssh $(Host) -t) screen -dRR $[HOST] ;; ???://*|????://*|?????://*|www.*) exec $(Host?ssh -X $(Host)) sensible-browser $(Program) ;; *) exec $(Host?ssh -X $(Host)) $(Program) ;; esac
*FvwmForm-Run: Command Exec case "$(Program)" in '') exec x-terminal-emulator $(Host?-ut -name @$(Host) -T @$(Host))$(Host!-name @localhost -T @localhost tpope) -e $(Host?tpope host ssh $(Host) -t) screen -dRR $[HOST] ;; ???://*|????://*|?????://*|www.*) exec $(Host?ssh -X $(Host)) sensible-browser $(Program) ;; *) exec $(Host?ssh -X $(Host)) $(Program) ;; esac
# Before saving the data, remove any previously saved data:
*FvwmForm-Run: Command DestroyModuleConfig FvwmForm-RunDefault: *
*FvwmForm-Run: Command !( /bin/echo \
Expand All @@ -2182,7 +2182,7 @@ DestroyModuleConfig FvwmForm-Run: *
) > ${FVWM_USERDIR}/.FvwmForm-Run
*FvwmForm-Run: Command !( /bin/echo \
"# This file last created by FvwmForm-Run on: `/bin/date`."; /bin/echo \
Exec case '"$(Program)"' in "'')" exec x-terminal-emulator $(Host?-ut -name @$(Host) -T @$(Host))$(Host!-name @localhost -T @localhost tpope) -e $(Host?tpope hostman ssh $(Host) -t) screen -dRR $[HOST] ';; ???://*|????://*|?????://*|www.*)' exec $(Host?ssh -X $(Host)) sensible-browser '$(Program)' ';; *)' exec $(Host?ssh -X $(Host)) '$(Program)' ';;' esac \
Exec case '"$(Program)"' in "'')" exec x-terminal-emulator $(Host?-ut -name @$(Host) -T @$(Host))$(Host!-name @localhost -T @localhost tpope) -e $(Host?tpope host ssh $(Host) -t) screen -dRR $[HOST] ';; ???://*|????://*|?????://*|www.*)' exec $(Host?ssh -X $(Host)) sensible-browser '$(Program)' ';; *)' exec $(Host?ssh -X $(Host)) '$(Program)' ';;' esac \
) > ${FVWM_USERDIR}/.FvwmForm-RunLast

*FvwmForm-Run: Button quit "In Terminal" ^J
Expand Down
2 changes: 1 addition & 1 deletion .ssh/config
Expand Up @@ -53,6 +53,6 @@ Host *
User tpope
ForwardAgent yes
VerifyHostKeyDNS yes
ProxyCommand sh -c '$HOME/bin/tpope hostman tunnel %h %p'
ProxyCommand sh -c '$HOME/bin/tpope-host tunnel %h %p'
ControlMaster auto
ControlPath /tmp/ssh_mux_tpope_%h_%p_%r
10 changes: 5 additions & 5 deletions .zshrc
Expand Up @@ -36,8 +36,8 @@ _git_prompt_info() {

autoload -Uz colors && colors

if [ -x "$HOME/bin/tpope" ]; then
hostcolor=$'\e['`$HOME/bin/tpope hostman ansi`m
if [ -x "$HOME/bin/tpope-host" ]; then
hostcolor=$'\e['`tpope-host ansi`m
else
hostcolor=$'\e[01;37m'
fi
Expand Down Expand Up @@ -139,9 +139,9 @@ periodic() { rehash }
# }}}1
# Named directories {{{1

boxen=(`tpope hostman list`)
hosts=(`tpope-host list`)
local host
for host in $boxen; do
for host in $hosts; do
[ "$host" != "$HOST" ] && family=($family $host)
if [ -L "$HOME/homes/$host" ]; then
typeset $host="$HOME/homes/$host"
Expand Down Expand Up @@ -199,7 +199,7 @@ zstyle ':completion::complete:*:(all-|)files' ignored-patterns '*\~'
zstyle ':completion::complete:*' ignore-parents parent pwd
zstyle ':completion::complete:rm::(all-|)files' ignored-patterns
# zstyle ':completion:*' group-name ''
zstyle ':completion:*' hosts localhost $boxen tpope.dyndns.org
zstyle ':completion:*' hosts localhost $hosts
zstyle ':completion:*' urls http://tpo.pe/ http://www.google.com/ https://github.com/
zstyle ':completion:*' insert-unambiguous true
# NO NO NO!!! This makes things SLOW
Expand Down
4 changes: 2 additions & 2 deletions bin/tpope
Expand Up @@ -127,9 +127,9 @@ case "$basename" in
if [ -x "$HOME/.irssi/Chat-script" -a -z "$*" ]; then
"$HOME/.irssi/Chat-script" $hostname
elif [ -z "$*" ]; then
exec tpope hostman ssh tpope.net -t '$HOME/.irssi/Chat-script' $hostname
exec tpope host ssh tpope.net -t '$HOME/.irssi/Chat-script' $hostname
else
exec tpope hostman ssh tpope.net -t '$HOME/.irssi/Chat-script' "$@"
exec tpope host ssh tpope.net -t '$HOME/.irssi/Chat-script' "$@"
fi ;;

clean) do_clean "$@" ;;
Expand Down

0 comments on commit 2dac5b2

Please sign in to comment.