Merge branch 'master' of git.246060.ru:f1x1t/zshrc

This commit is contained in:
Andrei Astafev 2020-12-09 09:42:26 +03:00
commit 2baad93acc
3 changed files with 16 additions and 6 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
.zcompdump* .zcompdump*
keychain-config.zsh keychain-config.zsh
*.user.zsh *.user.zsh
*.start.zsh

2
.zshrc
View File

@ -1,3 +1,5 @@
[ -e $ZDOTDIR/env.start.zsh ] && source $ZDOTDIR/env.start.zsh
source $ZDOTDIR/env.zsh source $ZDOTDIR/env.zsh
[ -e $ZDOTDIR/env.user.zsh ] && source $ZDOTDIR/env.user.zsh [ -e $ZDOTDIR/env.user.zsh ] && source $ZDOTDIR/env.user.zsh

18
env.zsh
View File

@ -14,9 +14,17 @@ export SVDIR=$HOME/sv
UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/default.cfg" UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/default.cfg"
[ -e "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG [ -e "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG
# Настройка компилятора Intel (если установлен) # Настройка Intel Studio
[ -e /opt/intel/bin/compilervars.sh ] && source /opt/intel/bin/compilervars.sh intel64 > /dev/null if [ ! -z ${ENABLE_INTEL_STUDIO+x} ]; then
[ -e /opt/intel/vtune_profiler/vtune-vars.sh ] && source /opt/intel/vtune_profiler/vtune-vars.sh > /dev/null #export COMPILERVARS_ARCHITECTURE=intel64
[ -e /opt/intel/inspector/inspxe-vars.sh ] && source /opt/intel/inspector/inspxe-vars.sh > /dev/null #export COMPILERVARS_PLATFORM=linux
[ -e /opt/intel/advisor/advixe-vars.sh ] && source /opt/intel/advisor/advixe-vars.sh > /dev/null #/opt/intel/bin/iccvars.sh
INTEL_VARS=( /opt/intel/advisor/advixe-vars.sh
/opt/intel/inspector/inspxe-vars.sh
/opt/intel/vtune_profiler/vtune-vars.sh )
for f in ${INTEL_VARS[*]}; do
[ -e "$f" ] && source "$f" > /dev/null
done
fi