mirror of
https://github.com/ViViDboarder/vim-settings.git
synced 2024-12-22 23:57:33 +00:00
Big update to coding helpers install to prefer system packages
Currently only for luarocks, pip, and npm packages.
This commit is contained in:
parent
3a637add78
commit
87ad6b6947
@ -41,13 +41,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Determines if a command exists or not
|
# Determines if a command exists or not
|
||||||
function command_exist() {
|
function command_exists() {
|
||||||
command -v "$1" > /dev/null 2>&1;
|
command -v "$1" > /dev/null 2>&1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Runs a command or spits out the output
|
# Runs a command or spits out the output
|
||||||
function maybe_run() {
|
function maybe_run() {
|
||||||
if command_exist "$1" ;then
|
if command_exists "$1" ;then
|
||||||
echo "> $*"
|
echo "> $*"
|
||||||
# shellcheck disable=2048,2086
|
# shellcheck disable=2048,2086
|
||||||
eval $*
|
eval $*
|
||||||
@ -56,29 +56,80 @@ function maybe_run() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Runs the "right" pip for installing
|
# Determine if we should install a command using userspace commands
|
||||||
function maybe_pip_install() {
|
function should_install_user() {
|
||||||
if command_exist pipx ;then
|
if ! command_exists "$1" ;then
|
||||||
# Prefer pipx to keep environments isolated
|
# Install in userspace if command doesn't exist
|
||||||
pipx upgrade "$@"
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local bin_path=""
|
||||||
|
bin_path="$(which "$1")"
|
||||||
|
|
||||||
|
# Install in user space if it's already installed in a subdir of the user
|
||||||
|
# home dir
|
||||||
|
if [[ ${bin_path}/ = ${HOME}/* ]] ;then
|
||||||
|
return 0
|
||||||
else
|
else
|
||||||
if command_exist pip3 ;then
|
echo "WARNING: $1 is already installed by the system."
|
||||||
# If pip3 is there, use it to ensure we're using pytho3
|
return 1
|
||||||
pip3 install --user --upgrade "$@"
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Runs the "right" pip for installing if there is no global package
|
||||||
|
function maybe_pip_install() {
|
||||||
|
# Filter for user path bins
|
||||||
|
local user_bins=()
|
||||||
|
for bin in "$@" ;do
|
||||||
|
if should_install_user "$bin" ;then
|
||||||
|
user_bins+=("$bin")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Short circuit if empty
|
||||||
|
if [ ${#user_bins[@]} -eq 0 ] ;then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if command_exists pipx ;then
|
||||||
|
# Prefer pipx to keep environments isolated
|
||||||
|
pipx upgrade "${user_bins[@]}"
|
||||||
|
else
|
||||||
|
if command_exists pip3 ;then
|
||||||
|
# If pip3 is there, use it to ensure we're using python 3
|
||||||
|
pip3 install --user --upgrade "${user_bins[@]}"
|
||||||
else
|
else
|
||||||
# Use pip and hope for the best
|
# Use pip and hope for the best
|
||||||
pip install --user --upgrade "$@"
|
pip install --user --upgrade "${user_bins[@]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Installs npm packages if there is no global package
|
||||||
|
function maybe_npm_install() {
|
||||||
|
# Filter for user path bins
|
||||||
|
local user_bins=()
|
||||||
|
for bin in "$@" ;do
|
||||||
|
if should_install_user "$bin" ;then
|
||||||
|
user_bins+=("$bin")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Short circuit if empty
|
||||||
|
if [ ${#user_bins[@]} -eq 0 ] ;then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
maybe_run npm install -g "${user_bins[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
## Language servers
|
## Language servers
|
||||||
function install_language_servers() {
|
function install_language_servers() {
|
||||||
echo "### Installing language servers..."
|
echo "### Installing language servers..."
|
||||||
|
|
||||||
# bash
|
# bash
|
||||||
if want_lang bash ;then
|
if want_lang bash ;then
|
||||||
maybe_run npm install -g bash-language-server
|
maybe_npm_install bash-language-server
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Kotlin
|
# Kotlin
|
||||||
@ -86,7 +137,7 @@ function install_language_servers() {
|
|||||||
|
|
||||||
# Python
|
# Python
|
||||||
if want_lang python ;then
|
if want_lang python ;then
|
||||||
maybe_run npm install -g pyright
|
maybe_npm_install pyright
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Rust
|
# Rust
|
||||||
@ -102,9 +153,11 @@ function install_language_servers() {
|
|||||||
|
|
||||||
# Go
|
# Go
|
||||||
if want_lang go ;then
|
if want_lang go ;then
|
||||||
|
if should_install_user gopls ;then
|
||||||
export GO111MODULE=on
|
export GO111MODULE=on
|
||||||
maybe_run go install golang.org/x/tools/gopls@latest
|
maybe_run go install golang.org/x/tools/gopls@latest
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
@ -120,7 +173,7 @@ function install_linters() {
|
|||||||
|
|
||||||
# CSS
|
# CSS
|
||||||
if want_lang css || want_lang web ;then
|
if want_lang css || want_lang web ;then
|
||||||
maybe_run npm install -g csslint
|
maybe_npm_install csslint
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Vim
|
# Vim
|
||||||
@ -135,7 +188,7 @@ function install_linters() {
|
|||||||
|
|
||||||
# Text / Markdown
|
# Text / Markdown
|
||||||
if want_lang text || want_lang prose ;then
|
if want_lang text || want_lang prose ;then
|
||||||
maybe_run npm install -g alex write-good
|
maybe_npm_install alex write-good
|
||||||
maybe_pip_install proselint
|
maybe_pip_install proselint
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -153,14 +206,18 @@ function install_linters() {
|
|||||||
|
|
||||||
# Lua
|
# Lua
|
||||||
if want_lang lua || want_lang neovim ;then
|
if want_lang lua || want_lang neovim ;then
|
||||||
|
if ! maybe_run lua -e "'require(\"lfs\")'" ;then
|
||||||
maybe_run luarocks --local install luafilesystem
|
maybe_run luarocks --local install luafilesystem
|
||||||
# Version pinned to version in pre-commit
|
fi
|
||||||
|
|
||||||
|
# Version pinned to version in pre-commit so we avoid global check
|
||||||
maybe_run luarocks --local install luacheck 1.1.0
|
maybe_run luarocks --local install luacheck 1.1.0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
if want_lang docker ;then
|
if want_lang docker ;then
|
||||||
hadolint_arm64=arm64
|
if should_install_user hadolint ;then
|
||||||
|
local hadolint_arm64=arm64
|
||||||
if [ "$(uname -s)" == "Darwin" ] ;then
|
if [ "$(uname -s)" == "Darwin" ] ;then
|
||||||
hadolint_arm64=x86_64
|
hadolint_arm64=x86_64
|
||||||
fi
|
fi
|
||||||
@ -170,6 +227,7 @@ function install_linters() {
|
|||||||
--exec "'mv ~/bin/{} ~/bin/hadolint && chmod +x ~/bin/hadolint'" \
|
--exec "'mv ~/bin/{} ~/bin/hadolint && chmod +x ~/bin/hadolint'" \
|
||||||
"hadolint-{system}-{arch}" ~/bin
|
"hadolint-{system}-{arch}" ~/bin
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Terraform
|
# Terraform
|
||||||
if want_lang terraform ;then
|
if want_lang terraform ;then
|
||||||
@ -196,12 +254,12 @@ function install_fixers() {
|
|||||||
|
|
||||||
# CSS/JS/HTML/JSON/YAML/Markdown/and more!
|
# CSS/JS/HTML/JSON/YAML/Markdown/and more!
|
||||||
if want_lang javascript || want_lang html || want_lang css || want_lang web || want_lang json ;then
|
if want_lang javascript || want_lang html || want_lang css || want_lang web || want_lang json ;then
|
||||||
maybe_run npm install -g prettier
|
maybe_npm_install prettier
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Python
|
# Python
|
||||||
if want_lang python ;then
|
if want_lang python ;then
|
||||||
maybe_pip_install black autopep8 reorder-python-imports
|
maybe_pip_install black reorder-python-imports
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Rust
|
# Rust
|
||||||
@ -212,12 +270,13 @@ function install_fixers() {
|
|||||||
# Lua
|
# Lua
|
||||||
if want_lang lua || want_lang neovim ;then
|
if want_lang lua || want_lang neovim ;then
|
||||||
# Version pinned to version in pre-commit
|
# Version pinned to version in pre-commit
|
||||||
local stylua_version=0.17.1
|
local stylua_version=0.19.1
|
||||||
if ! release-gitter --git-url "https://github.com/JohnnyMorganz/StyLua" \
|
if ! release-gitter --git-url "https://github.com/JohnnyMorganz/StyLua" \
|
||||||
--version "v$stylua_version" \
|
--version "v$stylua_version" \
|
||||||
|
--extract-files "stylua" \
|
||||||
--map-arch arm64=aarch64 \
|
--map-arch arm64=aarch64 \
|
||||||
--map-system Windows=windows --map-system Linux=linux --map-system Darwin=macos \
|
--map-system Windows=windows --map-system Linux=linux --map-system Darwin=macos \
|
||||||
--extract-all --exec "chmod +x ~/bin/stylua" \
|
--exec "chmod +x ~/bin/stylua" \
|
||||||
"stylua-{system}-{arch}.zip" ~/bin ; then
|
"stylua-{system}-{arch}.zip" ~/bin ; then
|
||||||
maybe_run cargo install --version "$stylua_version" stylua
|
maybe_run cargo install --version "$stylua_version" stylua
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user