Merge remote-tracking branch 'git.kebler.net/master' into giskard

giskard
Kebler Network System Administrator 2021-07-05 09:40:16 -07:00
commit 3543367774
5 changed files with 21 additions and 19 deletions

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
command -v docker >/dev/null 2>&1 || exit command -v docker >/dev/null 2>&1 || return
aws_docker () { aws_docker () {
local cred local cred

View File

@ -1,4 +1,4 @@
command -v docker >/dev/null 2>&1 || exit command -v docker >/dev/null 2>&1 || return
alias bashly='docker run --rm -it --volume "$PWD:/app" dannyben/bashly' alias bashly='docker run --rm -it --volume "$PWD:/app" dannyben/bashly'
alias bashly-update='docker pull dannyben/bashly:latest' alias bashly-update='docker pull dannyben/bashly:latest'

View File

@ -44,7 +44,7 @@ alias npma="npm-add-dependencies"
# alias npmpub="npm publish --access public" # alias npmpub="npm publish --access public"
alias npmlrepub="npm publish --registry http://localhost:4873 --force --access restricted" alias npmlrepub="npm publish --registry http://localhost:4873 --force --access restricted"
alias npmlpub="npm publish --registry http://localhost:4873 --access restricted" alias npmlpub="npm publish --registry http://localhost:4873 --access restricted"
alias npmkrepub="npm version patch && npm publish --registry https://npm.kebler.net --access restricted" alias npmkrepub="npm publish --registry https://npm.kebler.net --force --access restricted"
alias npmkpub="npm publish --registry https://npm.kebler.net --access restricted" alias npmkpub="npm publish --registry https://npm.kebler.net --access restricted"
alias npmpatch="npm version patch" alias npmpatch="npm version patch"
alias npmmajor="npm version major" alias npmmajor="npm version major"

View File

@ -1,4 +1,14 @@
#!/bin/bash #!/bin/bash
use_pyenv () {
if command -v pyenv >/dev/null 2>&1; then
export PYENV_ROOT="/opt/python/pyenv"
export PYENV_VERSION=${PYENV_VERSION:-3.8.7}
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
fi
}
# TODO make alias generating function for versions of python # TODO make alias generating function for versions of python
alias python3x="sudo -H python3.8 -m" alias python3x="sudo -H python3.8 -m"
alias spip="sudo -H python3.8 -m pip" alias spip="sudo -H python3.8 -m pip"
@ -14,24 +24,15 @@ alias pipi="pipx install"
alias pipl="pipx list" alias pipl="pipx list"
alias piplv="pipx list --verbose" alias piplv="pipx list --verbose"
if command -v pyenv >/dev/null 2>&1; then
# pyenv environment
path_append "/opt/python/bin" path_append "/opt/python/bin"
# eval "$(pyenv init -)" if command -v pipx >/dev/null 2>&1; then
# eval "$(pyenv virtualenv-init -)"
export PYENV_ROOT="/opt/python/pyenv"
export PYENV_VERSION=3.8.7
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
fi
path_append "/opt/python/apps/bin" path_append "/opt/python/apps/bin"
export PIPX_HOME=/opt/python/apps export PIPX_HOME=/opt/python/apps
export PIPX_BIN_DIR=$PIPX_HOME/bin export PIPX_BIN_DIR=$PIPX_HOME/bin
fi
[[ $USE_PYENV ]] && use_pyenv
spipua () { spipua () {
module_load confirm module_load confirm
@ -44,3 +45,4 @@ echo "$List"
confirm "ATTENTION: upgrade all these packages at once??" || return 0 confirm "ATTENTION: upgrade all these packages at once??" || return 0
echo "$List" | cut -d' ' -f1 | xargs -n1 sudo -H python$Ver -m pip install -U echo "$List" | cut -d' ' -f1 | xargs -n1 sudo -H python$Ver -m pip install -U
} }