diff options
| -rwxr-xr-x | config/zsh/zprofile | 28 | ||||
| -rwxr-xr-x | test | 34 |
2 files changed, 29 insertions, 33 deletions
diff --git a/config/zsh/zprofile b/config/zsh/zprofile index b64522f..1ec728f 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -36,7 +36,7 @@ export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py" export ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl" export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle -export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" # shellcheck disable=SC2016 export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" @@ -60,19 +60,19 @@ export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # shellcheck disable=SC2155 # color in man (less pager) -export LESS_TERMCAP_mb=$(printf '%b' '\e[1;32m') -export LESS_TERMCAP_md=$(printf '%b' '\e[1;32m') -export LESS_TERMCAP_me=$(printf '%b' '\e[0m') -export LESS_TERMCAP_se=$(printf '%b' '\e[0m') -export LESS_TERMCAP_so=$(printf '%b' '\e[01;33m') -export LESS_TERMCAP_ue=$(printf '%b' '\e[0m') -export LESS_TERMCAP_us=$(printf '%b' '\e[1;4;31m') -export LESS_TERMCAP_mr=$(tput rev) -export LESS_TERMCAP_mh=$(tput dim) -export LESS_TERMCAP_ZN=$(tput ssubm) -export LESS_TERMCAP_ZV=$(tput rsubm) -export LESS_TERMCAP_ZO=$(tput ssupm) -export LESS_TERMCAP_ZW=$(tput rsupm) +export LESS_TERMCAP_mb="$(printf '%b' '\e[1;32m')" +export LESS_TERMCAP_md="$(printf '%b' '\e[1;32m')" +export LESS_TERMCAP_me="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_se="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_so="$(printf '%b' '\e[01;33m')" +export LESS_TERMCAP_ue="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_us="$(printf '%b' '\e[1;4;31m')" +export LESS_TERMCAP_mr="$(tput rev)" +export LESS_TERMCAP_mh="$(tput dim)" +export LESS_TERMCAP_ZN="$(tput ssubm)" +export LESS_TERMCAP_ZV="$(tput rsubm)" +export LESS_TERMCAP_ZO="$(tput ssupm)" +export LESS_TERMCAP_ZW="$(tput rsupm)" export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies @@ -1,34 +1,30 @@ #!/bin/sh -set -o xtrace - -ret=0 +set -xe # SHELLCHECK -shellcheck install || ret=$? -shellcheck test || ret=$? -shellcheck local/bin/* || ret=$? -shellcheck -s sh config/zsh/.zshrc || ret=$? -shellcheck -s sh config/zsh/aliases.zsh || ret=$? -shellcheck -s sh -e SC2155 config/zsh/zprofile || ret=$? -shellcheck -s sh config/x11/xinitrc || ret=$? +shellcheck install +shellcheck test +shellcheck local/bin/* +shellcheck -s sh config/zsh/.zshrc +shellcheck -s sh config/zsh/aliases.zsh +shellcheck -s sh -e SC2155 config/zsh/zprofile +shellcheck -s sh config/x11/xinitrc # VINT -# vint -s config/vim/vimrc || ret=$? -# vint -s config/vim/pluggins.vim || ret=$? +# vint -s config/vim/vimrc +# vint -s config/vim/pluggins.vim # FLAKE8 -flake8 --ignore F821,E501,W504,N816,E241 config/qutebrowser/config.py || ret=$? -flake8 --ignore W504,CCR001 config/python/startup.py || ret=$? +flake8 --ignore F821,E501,W504,N816,E241 config/qutebrowser/config.py +flake8 --ignore W504,CCR001 config/python/startup.py # CRONTAB if crontab -h 2>&1 | grep -q '.*-T.*' then - crontab -T crontab/root.crontab || ret=$? - crontab -T crontab/user.crontab || ret=$? + crontab -T crontab/root.crontab + crontab -T crontab/user.crontab fi # XMONAD -[ ! "$CI" = 'true' ] && { xmonad --recompile || ret=$?; } - -exit $ret +[ ! "$CI" = 'true' ] && xmonad --recompile |