Move variables and tmpdir stuff to .zshenv and source from .profile

This commit is contained in:
Adam Goldsmith 2017-09-05 11:28:15 -04:00
parent bfdd3156b6
commit 0530d4ee76
2 changed files with 33 additions and 26 deletions

View File

@ -1,31 +1,6 @@
#-*- mode: sh; -*-
# Environment variables
export ARDUINO_DIR="/usr/share/arduino"
export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"
export QT_STYLE_OVERRIDE=gtk2
export ALTERNATE_EDITOR=""
export TERMINAL=roxterm
export CALIBRE_USE_SYSTEM_THEME=true
export WORDCHARS=${WORDCHARS/\//}
export PAGER=less
# Add $HOME/.bin to PATH if it exists
if [[ -d "$HOME/.bin" ]]; then
export PATH="$PATH:$HOME/.bin"
fi
# Set temporary files locations
if [[ ! -d "$TMPDIR" ]]; then
export TMPDIR="/tmp/$LOGNAME"
mkdir -p -m 700 "$TMPDIR"
fi
TMPPREFIX="${TMPDIR%/}/zsh"
if [[ ! -d "$TMPPREFIX" ]]; then
mkdir -p "$TMPPREFIX"
fi
source $HOME/.zshenv
# Gnupg setup
## Start the gpg-agent if not already running

32
.zshenv Normal file
View File

@ -0,0 +1,32 @@
#-*- mode: sh; -*-
# Environment variables
export ARDUINO_DIR="/usr/share/arduino"
export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"
export QT_STYLE_OVERRIDE=gtk2
export ALTERNATE_EDITOR=""
export TERMINAL=roxterm
export CALIBRE_USE_SYSTEM_THEME=true
export WORDCHARS=${WORDCHARS/\//}
export PAGER=less
# Add $HOME/.bin to PATH if it exists and is not already in the path
if [[ -d "$HOME/.bin" ]] && ! grep -q ":$HOME"'/\.bin\(:\|$\)' <<< "$PATH"
then
export PATH="$PATH:$HOME/.bin"
fi
# Set temporary files locations
if [[ ! -d "$TMPDIR" ]]
then
export TMPDIR="/tmp/$LOGNAME"
mkdir -p -m 700 "$TMPDIR"
fi
TMPPREFIX="${TMPDIR%/}/zsh"
if [[ ! -d "$TMPPREFIX" ]]
then
mkdir -p "$TMPPREFIX"
fi