make ruby/yarn configuration optional

This commit is contained in:
Ray Elliott 2020-06-30 17:17:56 +01:00
parent a9654b9d75
commit 22c9f6240e
2 changed files with 15 additions and 8 deletions

View File

@ -53,12 +53,6 @@ alias dokku='ssh -t dokku@dokku.isnet.uk'
alias pacman='~/.src/archnews/archnews_wrap' alias pacman='~/.src/archnews/archnews_wrap'
alias npm_real=$(command -v npm)
function npm {
echo "Please use Yarn instead!!"
echo " If you must use npm use: 'npm_real'"
}
# lf gets confused by TERMINFO env var when running in tmux # lf gets confused by TERMINFO env var when running in tmux
# https://github.com/gokcehan/lf/issues/138#issuecomment-464477665 # https://github.com/gokcehan/lf/issues/138#issuecomment-464477665
if [ -n "$TERMINFO" ] ; then if [ -n "$TERMINFO" ] ; then

17
profile
View File

@ -2,8 +2,21 @@ export SHELL_CONFIG="$SHELL_CONFIG:.profile"
export EDITOR=/usr/bin/vim export EDITOR=/usr/bin/vim
export BROWSER=/usr/bin/qutebrowser export BROWSER=/usr/bin/qutebrowser
ruby_path=$(ruby -r rubygems -e "puts Gem.user_dir")/bin if command -v ruby ; then
yarn_path=$(yarn global bin) ruby_path=$(ruby -r rubygems -e "puts Gem.user_dir")/bin
export PATH="$ruby_path:$PATH"
fi &> /dev/null
if command -v yarn ; then
yarn_path=$(yarn global bin)
export PATH="$yarn_path:$PATH"
alias npm_real=$(command -v npm)
function npm {
echo "Please use Yarn instead!!"
echo " If you must use npm use: 'npm_real'"
}
fi &> /dev/null
export PATH="$HOME/.bin:$HOME/.local/bin:$yarn_path:$ruby_path:$PATH" export PATH="$HOME/.bin:$HOME/.local/bin:$yarn_path:$ruby_path:$PATH"