diff --git a/neovim.sh b/neovim.sh index e91d275..f990898 100644 --- a/neovim.sh +++ b/neovim.sh @@ -16,8 +16,8 @@ PACKAGE=neovim if command_exists "$PACKAGE"; then - echo_warning "$PACKAGE is already installed!" - echo_warning "Exiting now!" + echo "$PACKAGE is already installed!" + echo "Exiting now!" exit 69 fi @@ -59,7 +59,7 @@ } getDependencies() { - echo_pkg "Checking build dependencies, and installs missing.." + echo_pkg deps "Checking build dependencies, and installs missing.." local depsDebian=(git ninja-build gettext cmake curl build-essential) local depsFedora=(git ninja-build cmake gcc make gettext curl glibc-gconv-extra) @@ -91,7 +91,7 @@ cloneSources() { cloneDir="$(mktemp -d)" - echo_pkg "Cloning neovim sources into tempdir at $cloneDir/neovim" + echo_pkg clone "Cloning neovim sources into tempdir at $cloneDir/neovim" cd $cloneDir || mkdir $cloneDir && cd $cloneDir if command_exists git; then @@ -108,9 +108,9 @@ } makeInstall() { - echo_pkg "Compiling neovim from source" + echo_pkg build "Compiling neovim from source" if run make CMAKE_BUILD_TYPE=RelWithDebInfo; then - echo_pkg "Installing neovim.." + echo_pkg install "Installing neovim.." run $_sudo make install else echo_error "Failure while building!" @@ -120,7 +120,7 @@ checkAndInitConfig() { if [ -d "$HOME/.config/nvim/" ]; then - echo_info "Prefetching neovim setup configuration.." + echo_pkg qol "Prefetching neovim setup configuration.." nvim --headless +q else echo_warning "You don't have a neovim config installed. Do you want to clone one now? [Y]es (standard), [m]inimal, [n]o" @@ -155,12 +155,13 @@ cloneSources makeInstall - checkAndInitConfig + checkAndInitConfig