hjp
/
dot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into wsr

This commit is contained in:
Peter J. Holzer 2018-09-18 17:09:29 +02:00
parent 85255f6faf 8c64f8791c
commit ea1d758748
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.zjava
View File

@ -6,8 +6,8 @@
if whence apppath > /dev/null if whence apppath > /dev/null
then then
for i in \ for i in \
/usr/local/jdk-10.0.1 \
/usr/local/jdk1.8.0_112 \ /usr/local/jdk1.8.0_112 \
/usr/local/jre1.6.0_14 \
/usr/local/java \ /usr/local/java \
/usr/lib/java /usr/lib/java
do do
@ -62,13 +62,4 @@ then
fi fi
done done
for i in /usr/local/openxchange
do
if [ -d "$i" ]
then
export OX_HOME="$i"
PATH=$(apppath "$i/bin" "$i/sbin")
break;
fi
done
fi fi

6
.zprofile
View File

@ -1,8 +1,8 @@
#
# $Id: .zprofile,v 1.22 2012-10-19 11:03:15 hjp Exp $
#
# this is sourced for login shells after .zshenv but before .zshrc # this is sourced for login shells after .zshenv but before .zshrc
# #
# Once upon a tim this was also sourced at the start of an Xsession, but
# that doesn't seem to be the case for my current debian systems (with
# lightdm/xfce) any more. So everything set here isn't available in X11.
umask 022 umask 022
unset MAILCHECK unset MAILCHECK

1
.zshenv
View File

@ -58,6 +58,7 @@ then
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin`
`$preppath -c -e -r /usr/lib/go-1.*/bin`
PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`