Changed handling of ssh-agent in a way I don't understand anymore
(looks like I commented it out in an obfuscated way) Override LC_COLLATE on Linux to get sane collation order (Hmm, I think I want that everywhere, not only on Linux).
This commit is contained in:
parent
ef921bdefc
commit
733eeed88d
|
@ -17,7 +17,10 @@ else
|
||||||
fi
|
fi
|
||||||
vhost=`echo "$vhost" | cut -d . -f 1`
|
vhost=`echo "$vhost" | cut -d . -f 1`
|
||||||
RECHNER=$vhost
|
RECHNER=$vhost
|
||||||
if [ -z "$SSH_AUTH_SOCK" -a -f "$HOME/.ssh/identity" ]
|
|
||||||
|
# I don't understand this any more.
|
||||||
|
# looks like a nop to me.
|
||||||
|
if [ -n "" -a -z "$SSH_AUTH_SOCK" -a -f "$HOME/.ssh/identity" ] && tty -s
|
||||||
then
|
then
|
||||||
eval `ssh-agent`
|
eval `ssh-agent`
|
||||||
ssh-add
|
ssh-add
|
||||||
|
|
5
.zshenv
5
.zshenv
|
@ -38,7 +38,7 @@ fi
|
||||||
# set PATH to direcories *I* want.
|
# set PATH to direcories *I* want.
|
||||||
PRIVATE_PATH=$HOME/bin/scripts:$HOME/bin:$HOME/public_html/bin:$HOME/pgreplica/bin
|
PRIVATE_PATH=$HOME/bin/scripts:$HOME/bin:$HOME/public_html/bin:$HOME/pgreplica/bin
|
||||||
ETC_PATH=/usr/sbin:/sbin:/opt/omni/sbin:/opt/omni/lbin:/var/qmail/bin:/usr/local/ssl/bin:/usr/adm/acct/wsr/bin:/opt/tusc/bin:/usr/local/pgsql/bin
|
ETC_PATH=/usr/sbin:/sbin:/opt/omni/sbin:/opt/omni/lbin:/var/qmail/bin:/usr/local/ssl/bin:/usr/adm/acct/wsr/bin:/opt/tusc/bin:/usr/local/pgsql/bin
|
||||||
LOCAL_PATH=/usr/local/arm-linux/bin:/usr/local/sbin:/usr/local/samba/bin:/usr/local/bin:/usr/local/bin/X11:/usr/local/povray3/bin:/usr/local/majordomo/bin:/usr/lib/majordomo/bin:/usr/local/vnc_x86_linux_2.0:/usr/local/rrdtool-1.0.35/bin
|
LOCAL_PATH=/usr/local/arm-linux/bin:/usr/local/sbin:/usr/local/samba/bin:/usr/local/bin:/usr/local/bin/X11:/usr/local/povray3/bin:/usr/local/majordomo/bin:/usr/lib/majordomo/bin:/usr/local/vnc_x86_linux_2.0:/usr/local/rrdtool-1.0.35/bin:/usr/local/OpenOffice.org1.0.2/program
|
||||||
BIN_PATH=/usr/bin/X11:/bin:/usr/bin:/usr/ccs/bin:/usr/openwin/bin:/opt/kde/bin:/opt/perl5/bin:/opt/Office51/bin:/usr/games:/usr/contrib/bin
|
BIN_PATH=/usr/bin/X11:/bin:/usr/bin:/usr/ccs/bin:/usr/openwin/bin:/opt/kde/bin:/opt/perl5/bin:/opt/Office51/bin:/usr/games:/usr/contrib/bin
|
||||||
JAVA_PATH=/usr/java/j2sdk1.4.0/bin:/usr/java/jdk1.3.1_02/bin:/usr/java/jre1.3.1_02/bin:/usr/local/jdk1.2.2/bin:/usr/java1.2/bin:/usr/local/jdk1.2/bin:/usr/local/jdk117_v3/bin:/usr/local/jdk1.1.6/bin:/usr/local/java/bin
|
JAVA_PATH=/usr/java/j2sdk1.4.0/bin:/usr/java/jdk1.3.1_02/bin:/usr/java/jre1.3.1_02/bin:/usr/local/jdk1.2.2/bin:/usr/java1.2/bin:/usr/local/jdk1.2/bin:/usr/local/jdk117_v3/bin:/usr/local/jdk1.1.6/bin:/usr/local/java/bin
|
||||||
ORACLE_PATH=$ORACLE_HOME/bin
|
ORACLE_PATH=$ORACLE_HOME/bin
|
||||||
|
@ -108,6 +108,9 @@ HP-UX*10.*)
|
||||||
export LANG=${LANG:-C.iso88591}
|
export LANG=${LANG:-C.iso88591}
|
||||||
export TZ=MEZ-1MESZ
|
export TZ=MEZ-1MESZ
|
||||||
;;
|
;;
|
||||||
|
Linux*)
|
||||||
|
export LC_COLLATE=POSIX
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
export NLS_LANG=american_america.WE8ISO8859P1
|
export NLS_LANG=american_america.WE8ISO8859P1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue