Skip to content

Commit

Permalink
remove another fork and tidy up
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonatwork committed Jul 18, 2015
1 parent 8ac2097 commit 6f6deaa
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .profile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fi

case "`uname 2> /dev/null`" in
windows32)
TERM=Cygwin
TERM=cygwin
;;
*)
TERM=xterm
Expand Down
66 changes: 34 additions & 32 deletions .shrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,47 @@ umask 022

unalias -a

# FreeBSD defaults
alias h="fc -l"
alias j=jobs
alias m="$PAGER"
alias ll="ls -laFo"
alias l="ls -l"
alias g="egrep -i"

# mine
alias ali=". $ENV"
alias cd..="cd .."
alias cdup="cd .."
alias cls=clear
alias dir=ls
alias h="fc -l"
alias j=jobs
alias l="$PAGER"
alias lk="ls -l | grep ^d"
alias ll="ls -l"
alias r="fc -e -"

alias fixperms="chmod -R go-rwx $HOME/.ssh $HOME/mail"

UNAME=`uname 2> /dev/null`
if [ "$UNAME" = "windows32" ]
then
alias find=gfind
alias sort=gsort
alias open=start
alias ps=tasklist
alias vi=vim
fi
unset UNAME

if ! echo "$SHELL" | grep -q ksh
then
if whereis whereis > /dev/null 2>&1
then
alias whence="whereis -qb"
fi
fi

if [ "`hostname 2> /dev/null`" = "sdf" ]
then
alias git="$HOME/pkg/git/bin/git --exec-path=$HOME/pkg/git/libexec/git-core"
fi
case "$SHELL" in
*ksh*)
;;
*)
if whereis -qb whereis > /dev/null 2>&1
then
alias whence="whereis -qb"
fi
;;
esac

case "`uname 2> /dev/null`" in
windows32)
alias find=gfind
alias sort=gsort
alias ps=tasklist
alias vi=vim
;;
*)
;;
esac

case "`hostname 2> /dev/null`" in
sdf)
alias git="$HOME/pkg/git/bin/git --exec-path=$HOME/pkg/git/libexec/git-core"
;;
*)
;;
esac

0 comments on commit 6f6deaa

Please sign in to comment.