Set JAVA_HOME only if /usr/lib/jvm/default-java existing.

This commit is contained in:
Gea-Suan Lin
2022-03-30 12:41:59 +08:00
parent f9eb12bbd1
commit 4d0bca1c12
2 changed files with 8 additions and 2 deletions

View File

@@ -51,13 +51,16 @@ export BLOCKSIZE="k"
export GIT_PAGER="less"
export HISTTIMEFORMAT="%y/%m/%d %T "
export HOMEBREW_NO_ANALYTICS=1
export JAVA_HOME=/usr/lib/jvm/default-java
export LESS="-EfmrSwX"
export LSCOLORS="gxfxcxdxbxegedabagacad"
export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.config/composer/vendor/bin:$HOME/node_modules/.bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH"
export PYTHONDONTWRITEBYTECODE=yes
export QUILT_PATCHES="debian/patches"
#
if [ -e /usr/lib/jvm/default-java ]; then
export JAVA_HOME=/usr/lib/jvm/default-java
fi
#
# Hack for gnome-terminal
if [ "$COLORTERM" == "gnome-terminal" -a -z "$TMUX" -a -z "$SCREEN" ]; then
export TERM=xterm-256color

5
.zshrc
View File

@@ -130,7 +130,6 @@ export GIT_PAGER="less"
export HISTFILE="$HOME/.history"
export HISTSIZE=2000
export HOMEBREW_NO_ANALYTICS=1
export JAVA_HOME=/usr/lib/jvm/default-java
export LESS="-EfmrSwX"
export LSCOLORS="gxfxcxdxbxegedabagacad"
export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.config/composer/vendor/bin:$HOME/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
@@ -138,6 +137,10 @@ export PYTHONDONTWRITEBYTECODE=yes
export QUILT_PATCHES="debian/patches"
export SAVEHIST=2000
#
if [[ -e /usr/lib/jvm/default-java ]]; then
export JAVA_HOME=/usr/lib/jvm/default-java
fi
#
if [[ -x /opt/homebrew/bin/most || -x /usr/local/bin/most || -x /usr/bin/most ]]; then
export PAGER="most"
else